diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-05 08:31:28 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-08 02:06:39 +0400 |
| commit | 57b58db74c3272ac13d5d201ecedf6483b34cdfe (patch) | |
| tree | b530170fcf23a0ebd9a02e01ffb63c41d0a6b3fe /t/t7608-merge-messages.sh | |
| parent | 7a2b128d13d880635e7317a9208cfa42a660f143 (diff) | |
merge: notice local merging of tags and keep it unwrapped
This also updates the autogenerated merge title message from "merge commit X"
to "merge tag X", and its effect can be seen in the changes to the test suite.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7608-merge-messages.sh')
| -rwxr-xr-x | t/t7608-merge-messages.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh index 9225fa6f02..8e7e0a5865 100755 --- a/t/t7608-merge-messages.sh +++ b/t/t7608-merge-messages.sh @@ -35,7 +35,7 @@ test_expect_success 'merge tag' ' git checkout master && test_commit master-3 && git merge tag-1 && - check_oneline "Merge commit Qtag-1Q" + check_oneline "Merge tag Qtag-1Q" ' test_expect_success 'ambiguous tag' ' @@ -44,7 +44,7 @@ test_expect_success 'ambiguous tag' ' git checkout master && test_commit master-4 && git merge ambiguous && - check_oneline "Merge commit QambiguousQ" + check_oneline "Merge tag QambiguousQ" ' test_expect_success 'remote-tracking branch' ' |