From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <git-owner@vger.kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN: AS53758 23.128.96.0/24
X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS,
	SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by dcvr.yhbt.net (Postfix) with ESMTP id 81D131F8C1
	for <e@yhbt.net>; Fri,  8 May 2020 16:43:57 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1726825AbgEHQn4 (ORCPT <rfc822;e@yhbt.net>);
        Fri, 8 May 2020 12:43:56 -0400
Received: from smtp.hosts.co.uk ([85.233.160.19]:55419 "EHLO smtp.hosts.co.uk"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1726750AbgEHQn4 (ORCPT <rfc822;git@vger.kernel.org>);
        Fri, 8 May 2020 12:43:56 -0400
Received: from [89.243.191.101] (helo=[192.168.1.37])
        by smtp.hosts.co.uk with esmtpa (Exim)
        (envelope-from <philipoakley@iee.email>)
        id 1jX66M-0000lk-7k; Fri, 08 May 2020 17:43:54 +0100
Subject: Re: [PATCH] rebase --autosquash: fix a potential segfault
To:     Johannes Schindelin <Johannes.Schindelin@gmx.de>,
        Andrei Rybak <rybak.a.v@gmail.com>
Cc:     Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
        git@vger.kernel.org, Paul Ganssle <paul@ganssle.io>,
        Jeff King <peff@peff.net>
References: <pull.625.git.1588624804554.gitgitgadget@gmail.com>
 <2367cf9d-2e37-b8c2-6881-f3e6c951a460@gmail.com>
 <nycvar.QRO.7.76.6.2005071626340.56@tvgsbejvaqbjf.bet>
From:   Philip Oakley <philipoakley@iee.email>
Message-ID: <1a03a7b4-f436-83c5-f825-3b68c07785e9@iee.email>
Date:   Fri, 8 May 2020 17:43:53 +0100
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101
 Thunderbird/68.8.0
MIME-Version: 1.0
In-Reply-To: <nycvar.QRO.7.76.6.2005071626340.56@tvgsbejvaqbjf.bet>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Content-Language: en-GB
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org

On 07/05/2020 15:27, Johannes Schindelin wrote:
> 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