From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Mateusz Loskot <mateusz@loskot.net>, git@vger.kernel.org
Subject: Re: Merge commit says refs/heads/<branchname> instead of <branchname>
Date: Wed, 13 Nov 2019 16:12:32 +0900 [thread overview]
Message-ID: <xmqq8sokb673.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20191113051530.GA3547@sigill.intra.peff.net> (Jeff King's message of "Wed, 13 Nov 2019 00:15:30 -0500")
Jeff King <peff@peff.net> writes:
> If I do:
>
> git reset --hard tip && git merge --no-edit refs/heads/side
> git log -1 --oneline
>
> then I get:
>
> Merge branch 'refs/heads/side'
>
> And the behavior seems the same going back to older versions of Git. Are
> you sure your workflow hasn't changed somehow?
>
> Can you show an example that triggers the behavior for you?
Yes, I am curious, too.
>> I'm failing to find in the docs what drives that change, what
>> configuration option controls such (default?) message.
>>
>> What may be the reason of that change?
>
> I think any change there would probably be unintentional (but it's hard
> to say for sure without tracking it down).
If older versions of git produced "Merge branch 'side'" when told to
merge 'refs/heads/side', I could sort-of believe it. And if we no
longer do so and instead record "Merge branch 'refs/heads/side'",
then I actually think that is a desirable change.
By the way, pulling from self follows slightly different rule, i.e.
$ git pull . refs/heads/side
would likely give you "Merge branch 'side'".
next prev parent reply other threads:[~2019-11-13 7:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-12 23:48 Merge commit says refs/heads/<branchname> instead of <branchname> Mateusz Loskot
2019-11-13 5:15 ` Jeff King
2019-11-13 7:12 ` Junio C Hamano [this message]
2019-11-15 21:54 ` Mateusz Loskot
2019-11-29 8:06 ` Mateusz Loskot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq8sokb673.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mateusz@loskot.net \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).