undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "contrib: subtree: adjust test to change in fmt-merge-msg"

Browse Source 
This reverts commit 508fd8e8ba.

In 6e6029a8 (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 <emilyshaffer@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Emily Shaffer 2020-08-03 11:57:49 -07:00 committed by Junio C Hamano
parent 85b4e0a6dc
commit b87528c4d7
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/subtree/t/t7900-subtree.sh
View File

@ -196,8 +196,7 @@ test_expect_success 'merge new subproj history into sub dir/ with --prefix' '
cd "$subtree_test_count" && cd "$subtree_test_count" &&
git fetch ./"sub proj" master && git fetch ./"sub proj" master &&
git subtree merge --prefix="sub dir" FETCH_HEAD && git subtree merge --prefix="sub dir" FETCH_HEAD &&
check_equal "$(last_commit_message)" \ check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
"Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master"
) )
' '
@ -274,8 +273,7 @@ test_expect_success 'merge new subproj history into subdir/ with a slash appende
cd "$test_count" && cd "$test_count" &&
git fetch ./subproj master && git fetch ./subproj master &&
git subtree merge --prefix=subdir/ FETCH_HEAD && git subtree merge --prefix=subdir/ FETCH_HEAD &&
check_equal "$(last_commit_message)" \ check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
"Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master"
) )
' '