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, 00:37 UTC
Message-ID
<CAGdFq_hw1630ELQP3+AEaCmUTEjYq7K1j8ZB-n0_rb1VN=wQgA@mail.gmail.com>
In-Reply-To
<7v39e2852t.fsf@alter.siamese.dyndns.org>
Heya,
On Sun, Nov 6, 2011 at 01:31, Junio C Hamano <gitster@pobox.com> wrote:
> We can guess that 7-hexdigit is an abbreviated commit object name but the
> above description and the title do not tell the most important thing. What
> commit are you trying to describe, and why is it a good idea to show it?

The same commit that the title and number are already being displayed for. It's a good idea to show that as that's a lot more convenient way to look up the commit that failed to apply than just a rather arbitrary number and the title.

Show 12 quoted lines
>> Reviewed-by: Eric Herman <eric@freesa.org>
>> Reviewed-by: Fernando Vezzosi <buccia@repnz.net>
>> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
>> Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
>
> I wouldn't have issues if these were Helped-by or Asked-by or something,
> but a patch with Reviewed-by for which I do not see any trace of
> discussion on this list triggers some WTF at least for me.
>
> Where did these reviews take place? What were their inputs and how was the
> patch improved based on them? Why I should trust the judgements of these
> people?

We had a little Git hackathon in Amsterdam today, the review was done IRL. In this case it consisted of Fernando pointing out that we should stick to the git cherry-pick format of displaying the hash/title (with the hash in square brackets before the title), rather than in parenthesis after the title like I had before. I wanted to give credit to their offline review somehow. If you'd prefer the "Helped-by" nomer for this case I'm fine with that.

> 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.

-- 
Cheers,

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