From: Junio C Hamano <gitster@pobox•com>
To: Johannes Sixt <j6t@kdbg•org>
Cc: "Pat Thoyts" <patthoyts@gmail•com>, "René Scharfe" <l.s.r@web•de>,
"Git Mailing List" <git@vger•kernel.org>
Subject: Re: [PATCH] git-gui: pass the branch name to git merge
Date: Tue, 22 Nov 2016 11:16:10 -0800 [thread overview]
Message-ID: <xmqqvavfpbph.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <6a6dd0b9-436d-327f-c33d-e5cce078b3a0@kdbg.org> (Johannes Sixt's message of "Tue, 22 Nov 2016 18:52:52 +0100")
Johannes Sixt <j6t@kdbg•org> writes:
> The recent rewrite of the 'git merge' invocation in b5f325cb
> (git-gui: stop using deprecated merge syntax) replaced the
> subsidiary call of 'git fmt-merge-msg' to take advantage of
> the capability of 'git merge' that can construct a merge log
> message when the rev being merged is FETCH_HEAD.
>
> A disadvantage of this method is, though, that the conflict
> markers are augmented with a raw SHA1 instead of a symbolic
> branch name.
Can't this be handled on the "git merge FETCH_HEAD" codepath
instead? The codepath already does enough "magic" things to
FETCH_HEAD like skipping 'not-for-merge' entries and also knows
about the original refnames the commits to be merged came from.
next prev parent reply other threads:[~2016-11-22 19:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-22 17:52 [PATCH] git-gui: pass the branch name to git merge Johannes Sixt
2016-11-22 19:16 ` Junio C Hamano [this message]
2016-11-22 20:40 ` Johannes Sixt
2016-11-23 19:23 ` Johannes Sixt
2016-11-23 20:05 ` Junio C Hamano
2016-11-23 22:36 ` Johannes Sixt
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqvavfpbph.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=j6t@kdbg$(echo .)org \
--cc=l.s.r@web$(echo .)de \
--cc=patthoyts@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox