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

From: Philip Oakley <philipoakley@iee.email>
Date: May 18, 2020, 16:47 UTC
Message-ID: <fc616e86-dfc1-fccf-d22b-ad2aee0d1b16@iee.email>
In-Reply-To: <4f2ddbba-a9ba-a96a-36c1-b233ea861575@gmail.com>

Hi all,

On 08/05/2020 17:57, Andrei Rybak wrote:

Show 15 quoted lines

> On 2020-05-08 18:43, Philip Oakley wrote:
>> On 07/05/2020 15:27, Johannes Schindelin wrote:
>> 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
> Yes, it's documented in description of --autosquash: "A commit matches the `...`
> if the commit subject matches, or if the `...` refers to the commit's hash."

The docs don't clarify if a full oid has is required, or a unique abbreviation within the repository, or just unique within the rebase instruction sheet.

I'd presume that all it needed was the latter, but could easily expect the former (full oid) to be 'matching', while the mid ground may be fairly simple to code...

Philip