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

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

From
Sverre Rabbelier <srabbelier@gmail.com>
Date
Nov 6, 2011, 19:35 UTC
Message-ID
<CAGdFq_j7NxojZ+82s0GJ8ZF0oyd5sH8t0kcMOTQGtKbASXqYTA@mail.gmail.com>
In-Reply-To
<7vy5vt7uqo.fsf@alter.siamese.dyndns.org>
Heya,
On Sun, Nov 6, 2011 at 05:14, Junio C Hamano <gitster@pobox.com> wrote:
Show 6 quoted lines
> 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")?

Aaah, I understand the concern you raise now. In that case a spurious [] would be printed, which I agree is less than desirable. Would checking 'if test -n $commit' be sufficient?

-- 
Cheers,

Sverre Rabbelier
Previous: Junio C HamanoNext: Junio C Hamano
Message 5 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.