Skip to content

Commit b87528c

Browse files
nasamuffingitster
authored andcommitted
Revert "contrib: subtree: adjust test to change in fmt-merge-msg"
This reverts commit 508fd8e. In 6e6029a (fmt-merge-msg: allow merge destination to be omitted again) we get back the behavior where merges against 'master', by default, do not include "into 'master'" at the end of the merge message. This test fix is no longer needed. Signed-off-by: Emily Shaffer <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 85b4e0a commit b87528c

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

contrib/subtree/t/t7900-subtree.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@ 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)" \
200-
"Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master"
199+
check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
201200
)
202201
'
203202

@@ -274,8 +273,7 @@ test_expect_success 'merge new subproj history into subdir/ with a slash appende
274273
cd "$test_count" &&
275274
git fetch ./subproj master &&
276275
git subtree merge --prefix=subdir/ FETCH_HEAD &&
277-
check_equal "$(last_commit_message)" \
278-
"Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master"
276+
check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
279277
)
280278
'
281279

0 commit comments

Comments
 (0)