diff options
| author |  Đoàn Trần Công Danh <congdanhqx@gmail.com> | 2020-06-29 23:20:03 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-06-30 08:41:15 -0700 |
| commit | 508fd8e8baf3e18ee40b2cf0b8899188a8506d07 (patch) | |
| tree | f477317b642bdbd5c726807a0ebaea1dc782cd4b | |
| parent | testsvn: respect `init.defaultBranch` (diff) | |
| download | tgif-508fd8e8baf3e18ee40b2cf0b8899188a8506d07.tar.xz | |
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>
| -rwxr-xr-x | contrib/subtree/t/t7900-subtree.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh index 57ff4b25c1..53d7accf94 100755 --- a/contrib/subtree/t/t7900-subtree.sh +++ b/contrib/subtree/t/t7900-subtree.sh @@ -196,7 +196,8 @@ 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)'\''" + check_equal "$(last_commit_message)" \ + "Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master" ) ' @@ -273,7 +274,8 @@ 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)'\''" + check_equal "$(last_commit_message)" \ + "Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master" ) ' |