diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-11-04 21:31:28 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-11-07 14:06:39 -0800 |
commit | 57b58db74c3272ac13d5d201ecedf6483b34cdfe (patch) | |
tree | b530170fcf23a0ebd9a02e01ffb63c41d0a6b3fe /builtin | |
parent | 7a2b128d13d880635e7317a9208cfa42a660f143 (diff) | |
download | git-57b58db74c3272ac13d5d201ecedf6483b34cdfe.tar.gz git-57b58db74c3272ac13d5d201ecedf6483b34cdfe.tar.xz |
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 'builtin')
-rw-r--r-- | builtin/merge.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index dffd5ec12..6a44b6d48 100644 --- 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; } + 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); |