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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Andrei,
On 08/05/2020 17:57, Andrei Rybak wrote:
> 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."
I've never read it that way, especially given the `git commit fixup=`
description. That one strongly suggests that one starts with the subject
and then finds the commit id from that.

We do see in the side discussion that the todo list uses the oid, rather
than the subject, which is given verbatim, but the docs are rather
opaque on the question of oid vs subject. 

If it is only the second guessing of the meaning of those three dots
then maybe the docs do need a  bit of clarification.

Philip



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux