diff options
| author | Emily Shaffer <emilyshaffer@google.com> | 2020-08-03 18:57:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-03 19:48:00 (GMT) |
| commit | b87528c4d7b0a28430da405f8f4b18f2fb8b953b (patch) | |
| tree | fb919456d345608a411630be2cc4fd8205c10d48 /contrib | |
| parent | 85b4e0a6dc8407de6f69808d9ee6debdf167ced3 (diff) | |
| download | git-b87528c4d7b0a28430da405f8f4b18f2fb8b953b.zip git-b87528c4d7b0a28430da405f8f4b18f2fb8b953b.tar.gz git-b87528c4d7b0a28430da405f8f4b18f2fb8b953b.tar.bz2 | |
Revert "contrib: subtree: adjust test to change in fmt-merge-msg"
This reverts commit 508fd8e8baf3e18ee40b2cf0b8899188a8506d07.
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>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/subtree/t/t7900-subtree.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh index 53d7acc..57ff4b2 100755 --- a/contrib/subtree/t/t7900-subtree.sh +++ b/contrib/subtree/t/t7900-subtree.sh @@ -196,8 +196,7 @@ test_expect_success 'merge new subproj history into sub dir/ with --prefix' ' cd "$subtree_test_count" && git fetch ./"sub proj" master && git subtree merge --prefix="sub dir" FETCH_HEAD && - check_equal "$(last_commit_message)" \ - "Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master" + check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''" ) ' @@ -274,8 +273,7 @@ test_expect_success 'merge new subproj history into subdir/ with a slash appende cd "$test_count" && git fetch ./subproj master && git subtree merge --prefix=subdir/ FETCH_HEAD && - check_equal "$(last_commit_message)" \ - "Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master" + check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''" ) ' |