From: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Date: Wed, 11 Mar 2026 20:16:13 GMT
Subject: Re: [PATCH v2] merge-file: fix BUG when --object-id is used in a worktree
Message-ID: <4b2a192e-240a-45d2-92a5-7ab669f481a9@app.fastmail.com>
In-Reply-To: <xmqq5x72qnu6.fsf@gitster.g>

On Wed, Mar 11, 2026, at 18:26, Junio C Hamano wrote:
>>>[snip]
>>
>> Turns out that this has been attempted least once before:
>>
>> https://lore.kernel.org/git/1472230741-5161-1-git-send-email-dev+git@drbeat.li/
>
> True.
>
> Perhaps something like this patch makes it clear that what the gitk
> command gives and what --pretty=reference gives are not identical,
> to avoid confusion like this?  I dunno.
>
>
>  Documentation/SubmittingPatches | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git c/Documentation/SubmittingPatches w/Documentation/SubmittingPatches
> index e270ccbe85..fad0b41af0 100644
> --- c/Documentation/SubmittingPatches
> +++ w/Documentation/SubmittingPatches
> @@ -335,7 +335,7 @@ date)", like this:
>  ....
>
>  The "Copy commit reference" command of gitk can be used to obtain this
> -format (with the subject enclosed in a pair of double-quotes), or this

And now I see for the first time that the doc points out the difference
already... I’m really paying attention it turns out.

> +format (but with the subject enclosed in an extra pair of double-quotes), or this

I think replacing “with” with “but” is good. But why “extra” pairs? It’s
just a pair of double quotes.

>  invocation of `git show`:
>
>  ....