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 <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Đoàn Trần Công Danh committed
Jun 29, 2020 at 23:20 UTC
508fd8e8baf3e18ee40b2cf0b8899188a8506d07
1 file changed
+4
-2
contrib/subtree/t/t7900-subtree.sh
+4
-2
@@ -196,7 +196,8 @@ 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)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
199
+ check_equal "$(last_commit_message)" \
200
+ "Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master"
201
)
202
'
203
@@ -273,7 +274,8 @@ test_expect_success 'merge new subproj history into subdir/ with a slash appende
274
cd "$test_count" &&
275
git fetch ./subproj master &&
276
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"
279
)
280
'
281