From: Junio C Hamano Date: Sat, 05 Nov 2011 04:37:25 GMT Subject: Re: [git patches] libata updates, GPG signed (but see admin notes) Message-ID: <7vipmz9oca.fsf@alter.siamese.dyndns.org> In-Reply-To: Linus Torvalds writes: > However - exactly beause git apparently makes it do that "Merge commit > " message, I suspect we've peeled things too early and too much. We've > peeled it so early that once again something thinks it's a commit, not > a tag. And you are right. I am working on a larger series that should sit on top of 89587fa (Split GPG interface into its own helper library, 2011-09-07), which is the first commit in jc/signed-commit topic. -- >8 -- Subject: [PATCH] merge: notice local merging of tags and keep it unwrapped Signed-off-by: Junio C Hamano --- builtin/merge.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index f61b367..ce3b4f8 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -428,6 +428,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); -- 1.7.8.rc0.108.g71b5ec