Re: [PATCH] merge: indicate remote tracking branches in merge message
- From
Jeff King <peff@peff.net>
- Date
- Aug 9, 2009, 10:07 UTC
- Message-ID
- <20090809100712.GA26250@coredump.intra.peff.net>
- In-Reply-To
- <20090809100045.GA25197@coredump.intra.peff.net>
On Sun, Aug 09, 2009 at 06:00:45AM -0400, Jeff King wrote:
> [1/3] add tests for merge message headings > [2/3] merge: fix incorrect merge message for ambiguous tag/branch > [3/3] merge: indicate remote tracking branches in merge message
And here is the 4/3 you mentioned earlier:
-- >8 -- Subject: [PATCH] merge: describe tags as such in merge message
Previously, merging a tag directly via "git merge tag" would get you the message "Merge commit 'tag'". It is a little more descriptive to note that it was actually a tag (i.e., "Merge tag 'tag'").
Signed-off-by: Jeff King <peff@peff.net> --- builtin-merge.c | 5 +++++ t/t7608-merge-messages.sh | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/builtin-merge.c b/builtin-merge.c index f4de73f..db74901 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -380,6 +380,11 @@ static void merge_name(const char *remote, struct strbuf *msg) 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; + } } /* See if remote matches <name>^^^.. or <name>~<number> */ diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh index 28d5679..3ee0983 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 branch' '
-- 1.6.4.178.g7a987