diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-05 05:31:28 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-07 23:06:39 +0100 |
| commit | 57b58db74c3272ac13d5d201ecedf6483b34cdfe (patch) | |
| tree | b530170fcf23a0ebd9a02e01ffb63c41d0a6b3fe /t/t7600-merge.sh | |
| parent | fetch: do not store peeled tag object names in FETCH_HEAD (diff) | |
| download | git-57b58db74c3272ac13d5d201ecedf6483b34cdfe.tar.xz git-57b58db74c3272ac13d5d201ecedf6483b34cdfe.zip | |
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/t7600-merge.sh')
| -rwxr-xr-x | t/t7600-merge.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 3008e4e121..b91d022bc6 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -38,8 +38,8 @@ printf '%s\n' '1 X' 2 3 4 '5 X' 6 7 8 '9 X' >result.1-5-9 >empty create_merge_msgs () { - echo "Merge commit 'c2'" >msg.1-5 && - echo "Merge commit 'c2'; commit 'c3'" >msg.1-5-9 && + echo "Merge tag 'c2'" >msg.1-5 && + echo "Merge tags 'c2' and 'c3'" >msg.1-5-9 && { echo "Squashed commit of the following:" && echo && @@ -57,7 +57,7 @@ create_merge_msgs () { } >squash.1-5-9 && echo >msg.nolog && { - echo "* commit 'c3':" && + echo "* tag 'c3':" && echo " commit 3" && echo } >msg.log |