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>
Emily Shaffer committed
Aug 3, 2020 at 11:57 UTC
b87528c4d7b0a28430da405f8f4b18f2fb8b953b
1 file changed
+2
-4
contrib/subtree/t/t7900-subtree.sh
+2
-4
@@ -196,8 +196,7 @@ test_expect_success 'merge new subproj history into sub dir/ with --prefix' '
196
cd "$subtree_test_count" &&
197
git fetch ./"sub proj" master &&
198
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)'\''"
200
)
201
'
202
@@ -274,8 +273,7 @@ test_expect_success 'merge new subproj history into subdir/ with a slash appende
273
cd "$test_count" &&
274
git fetch ./subproj master &&
275
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)'\''"
277
)
278
'
279