git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] git-gui: pass the branch name to git merge

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 22, 2016, 19:16 UTC
Message-ID
<xmqqvavfpbph.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<6a6dd0b9-436d-327f-c33d-e5cce078b3a0@kdbg.org>
Johannes Sixt <j6t@kdbg.org> writes:
Show 9 quoted lines
> 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.

Previous: Johannes SixtNext: Johannes Sixt
Message 2 of 6 in “git-gui: pass the branch name to git merge”
  1. git-gui: pass the branch name to git mergeJohannes Sixt, Nov 22, 2016
  2. Junio C HamanoNov 22, 2016
  3. Johannes SixtNov 22, 2016
  4. Johannes SixtNov 23, 2016
  5. Junio C HamanoNov 23, 2016
  6. Johannes SixtNov 23, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.