From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 07 May 2020 14:27:36 GMT
Subject: Re: [PATCH] rebase --autosquash: fix a potential segfault
Message-ID: <nycvar.QRO.7.76.6.2005071626340.56@tvgsbejvaqbjf.bet>
In-Reply-To: <2367cf9d-2e37-b8c2-6881-f3e6c951a460@gmail.com>

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