Skip to content

Commit 508fd8e

Browse files
sgngitster
authored andcommitted
contrib: subtree: adjust test to change in fmt-merge-msg
We're starting to stop treating `master' specially in fmt-merge-msg. Adjust the test to reflect that change. Signed-off-by: Đoàn Trần Công Danh <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0068f21 commit 508fd8e

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

contrib/subtree/t/t7900-subtree.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,8 @@ test_expect_success 'merge new subproj history into sub dir/ with --prefix' '
196196
cd "$subtree_test_count" &&
197197
git fetch ./"sub proj" master &&
198198
git subtree merge --prefix="sub dir" FETCH_HEAD &&
199-
check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
199+
check_equal "$(last_commit_message)" \
200+
"Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master"
200201
)
201202
'
202203

@@ -273,7 +274,8 @@ test_expect_success 'merge new subproj history into subdir/ with a slash appende
273274
cd "$test_count" &&
274275
git fetch ./subproj master &&
275276
git subtree merge --prefix=subdir/ FETCH_HEAD &&
276-
check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
277+
check_equal "$(last_commit_message)" \
278+
"Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master"
277279
)
278280
'
279281

0 commit comments

Comments
 (0)