Re: [PATCH] rebase --autosquash: fix a potential segfault

From: Philip Oakley <philipoakley@iee.email>
Date: May 8, 2020, 16:43 UTC
Message-ID: <1a03a7b4-f436-83c5-f825-3b68c07785e9@iee.email>
In-Reply-To: <nycvar.QRO.7.76.6.2005071626340.56@tvgsbejvaqbjf.bet>

On 07/05/2020 15:27, Johannes Schindelin wrote:

Show 33 quoted lines

> Hi Andrei,
>
> On Wed, 6 May 2020, Andrei Rybak wrote:
>
>> On 2020-05-04 22:40, Johannes Schindelin via GitGitGadget wrote:
>>> However, as reported by Paul Ganssle, that need not be true: the special
>>> form `fixup! <commit-hash>` is allowed to point to _another_ fixup
>>> commit in the middle of the fixup chain.
>>>
>>> Example:
>>>
>>> 	* 0192a To fixup
>>> 	* 02f12 fixup! To fixup
>>> 	* 03763 fixup! To fixup
>>> 	* 04ecb fixup! 02f12
>> Could you please clarify if I'm understanding this correctly: does this
>> affect the fixups-of-a-fixup which were created by
>>
>> 	git commit --fixup=<pointer to previous fixup! commit>
>>
>> ? For example:
>>
>> 	* 0192a To fixup
>> 	* 02f12 fixup! To fixup
>> 	* 03763 fixup! To fixup
>> 	* 04ecb fixup! fixup! To fixup
>>
>> Where 04ecb was created by pointing option --fixup at 02f12.
> No, it only affects commits whose oneline (i.e. the first line of the
> commit message) is `fixup! <commit-hash>`.
>
> Ciao,
> Johannes

Is this ability to have a commit message `fixup! <commit-hash>` documented?

I've looked a few times in the past and didn't find it. The docs for `git commit --fixup=` doesn't put the oid in the commit's subject line, rather it puts the subject of the referent commit after the "fixup! ".

Searching from a different direction I've just seen it is mentioned in the v1.7.4 release notes.

Would a doc fix to clarify this be appropriate or have I missed something?

Philip