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>

diff --git a/builtin/merge.c b/builtin/merge.c
index dffd5ec1245865259fd4e72cc304286a1a5b4633..6a44b6d485fd9fd6621ed07d267a95a951695495 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -441,6 +441,11 @@ static void merge_name(const char *remote, struct strbuf *msg)
                                    sha1_to_hex(branch_head), remote);
                        goto cleanup;
                }
                                    sha1_to_hex(branch_head), remote);
                        goto cleanup;
                }

+               if (!prefixcmp(found_ref, "refs/tags/")) {
+                       strbuf_addf(msg, "%s\t\ttag '%s' of .\n",
+                                   sha1_to_hex(branch_head), remote);
+                       goto cleanup;
+               }

                if (!prefixcmp(found_ref, "refs/remotes/")) {
                        strbuf_addf(msg, "%s\t\tremote-tracking branch '%s' of .\n",
                                    sha1_to_hex(branch_head), remote);
                if (!prefixcmp(found_ref, "refs/remotes/")) {
                        strbuf_addf(msg, "%s\t\tremote-tracking branch '%s' of .\n",
                                    sha1_to_hex(branch_head), remote);

diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 983e34bec67a4cc4ba1182332e495377cc879ac9..222f7559e92caa2a0bbd128b0bb6bac14e2e113f 100755 (executable)
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -346,11 +346,11 @@ test_expect_success 'set up more tangled history' '
 '
 
 cat > expect <<\EOF
 '
 
 cat > expect <<\EOF

-*   Merge commit 'reach'
+*   Merge tag 'reach'

 |\
 | \
 |  \
 |\
 | \
 |  \

-*-. \   Merge commit 'octopus-a'; commit 'octopus-b'
+*-. \   Merge tags 'octopus-a' and 'octopus-b'

 |\ \ \
 * | | | seventh
 | | * | octopus-b
 |\ \ \
 * | | | seventh
 | | * | octopus-b

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 3008e4e1210900be3bdc2e28dddd681ce8ec3551..b91d022bc6f1886ead6780387da5a871c2e359ec 100755 (executable)
--- 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 () {
 >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 &&
        {
                echo "Squashed commit of the following:" &&
                echo &&


@@ -57,7 +57,7 @@ create_merge_msgs () {
        } >squash.1-5-9 &&
        echo >msg.nolog &&
        {
        } >squash.1-5-9 &&
        echo >msg.nolog &&
        {

-               echo "* commit 'c3':" &&
+               echo "* tag 'c3':" &&

                echo "  commit 3" &&
                echo
        } >msg.log
                echo "  commit 3" &&
                echo
        } >msg.log

diff --git a/t/t7604-merge-custom-message.sh b/t/t7604-merge-custom-message.sh
index 9114785ef7c850ae2d393bed3565e13f11339ba0..89619cf44608282efa6d75c2ed93cd3bdc4096fc 100755 (executable)
--- a/t/t7604-merge-custom-message.sh
+++ b/t/t7604-merge-custom-message.sh
@@ -11,7 +11,7 @@ create_merge_msgs() {
 
        cp exp.subject exp.log &&
        echo >>exp.log "" &&
 
        cp exp.subject exp.log &&
        echo >>exp.log "" &&

-       echo >>exp.log "* commit 'c2':" &&
+       echo >>exp.log "* tag 'c2':" &&

        echo >>exp.log "  c2"
 }
 
        echo >>exp.log "  c2"
 }
 

diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh
index 9225fa6f025cd9586b46f30464a69ccb57ca6b2a..8e7e0a5865d762c1cb859154c2d4735b9bf8722b 100755 (executable)
--- 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 &&
        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' '
 '
 
 test_expect_success 'ambiguous tag' '


@@ -44,7 +44,7 @@ test_expect_success 'ambiguous tag' '
        git checkout master &&
        test_commit master-4 &&
        git merge ambiguous &&
        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' '
 '
 
 test_expect_success 'remote-tracking branch' '