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

Re: [PATCH] Add abbreviated commit hash to rebase conflict message

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 6, 2011, 04:14 UTC
Message-ID
<7vy5vt7uqo.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CAGdFq_hw1630ELQP3+AEaCmUTEjYq7K1j8ZB-n0_rb1VN=wQgA@mail.gmail.com>
Sverre Rabbelier <srabbelier@gmail.com> writes:
> We had a little Git hackathon in Amsterdam today,...
Ah, that was the context I was missing.
Show 6 quoted lines
>> What happens when threeway is not enabled, and especially when "git am" is
>> used for applying patches, not within rebase?
>
> The same thing that already happens. I'm not sure what it is, but
> whatever title/number is shown, the matching hash is now shown as
> well. This patch does not change that behavior.

I am puzzled, but that cannot be true. The existing message uses $msgnum and $FIRSTLINE but does not use $commit because it does not necessarily exist.

What a value would the variable contain when I am applying your original patch message using "git am -s" (or "git am -s3")?

Previous: Sverre RabbelierNext: Sverre Rabbelier
Message 4 of 9 in “Add abbreviated commit hash to rebase conflict message”
  1. Add abbreviated commit hash to rebase conflict messageSverre Rabbelier, Nov 5, 2011
  2. Junio C HamanoNov 6, 2011
  3. Sverre RabbelierNov 6, 2011
  4. Junio C HamanoNov 6, 2011
  5. Sverre RabbelierNov 6, 2011
  6. Junio C HamanoNov 6, 2011
  7. Sverre RabbelierNov 6, 2011
  8. Junio C HamanoNov 7, 2011
  9. Junio C HamanoNov 9, 2011

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.