diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-08-10 10:24:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-10 10:24:01 -0700 |
| commit | 83b8250904d3c5e6107a70c27759e91160e139b0 (patch) | |
| tree | 808c0cda4265dadbb3b2cdb6f971ed09f0226772 | |
| parent | Merge branch 'rs/bisect-oid-to-hex-fix' (diff) | |
| parent | Revert "contrib: subtree: adjust test to change in fmt-merge-msg" (diff) | |
| download | tgif-83b8250904d3c5e6107a70c27759e91160e139b0.tar.xz | |
Merge branch 'es/adjust-subtree-test-for-merge-msg-update'
Adjust tests in contrib/ to the recent change to fmt-merge-msg.
* es/adjust-subtree-test-for-merge-msg-update:
Revert "contrib: subtree: adjust test to change in fmt-merge-msg"
| -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 53d7accf94..57ff4b25c1 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)'\''" ) ' |