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

Re: [PATCH 1/3] octopus: make merge process simpler to follow

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 12, 2009, 08:53 UTC
Message-ID
<7vljh8vaj4.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1260578339-30750-1-git-send-email-bebarino@gmail.com>
Stephen Boyd <bebarino@gmail.com> writes:
Show 10 quoted lines
> Its not very easy to understand what heads are being merged given
> the current output of an octopus merge. Fix this by replacing the
> sha1 with the (usually) better description in GITHEAD_<SHA1>.
>
> Suggested-by: Jari Aalto <jari.aalto@cante.net>
> Signed-off-by: Stephen Boyd <bebarino@gmail.com>
> ---
>
> Maybe this will work? At least it will replace the sha1 with
> whatever is given on the command line.

This shows what was given from the command line instead of the commit object name. I think it makes sense to not even make this dependent on any option. Also I don't think anybody misses the commit object name in the output---after all, that is all internal to git and is different from what the user gave us anyway (unless the user did give us the full 40-char object name, in which case the value of GITHEAD_<SHA1> would be that name, and we will show it, which is also fine).

No, I haven't applied nor run it yet. The above is purely from my cursory reading of the code.

Anyway, I'll keep this in my inbox or queue it on 'pu' if I had time.
Previous: Stephen BoydNext: Johannes Sixt
Message 4 of 14 in “FEATURE REQUEST: Announce branch name with merge comamnd”
  1. Jari AaltoDec 11, 2009
  2. Junio C HamanoDec 11, 2009
  3. 1/3 octopus: make merge process simpler to followStephen Boyd, Dec 12, 2009
  4. Junio C HamanoDec 12, 2009
  5. Johannes SixtDec 12, 2009
  6. Junio C HamanoDec 12, 2009
  7. octopus: make merge process simpler to followStephen Boyd, Dec 15, 2009
  8. Junio C HamanoDec 15, 2009
  9. Stephen BoydDec 15, 2009
  10. 2/3 octopus: reenable fast-forward mergesStephen Boyd, Dec 12, 2009
  11. 3/3 octopus: remove dead codeStephen Boyd, Dec 12, 2009
  12. Junio C HamanoDec 12, 2009
  13. Alex RiesenDec 12, 2009
  14. Jari AaltoDec 12, 2009

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.