From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 05D9A1F8C1 for ; Fri, 8 May 2020 17:21:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727099AbgEHRVS (ORCPT ); Fri, 8 May 2020 13:21:18 -0400 Received: from smtp.hosts.co.uk ([85.233.160.19]:17370 "EHLO smtp.hosts.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726750AbgEHRVS (ORCPT ); Fri, 8 May 2020 13:21:18 -0400 Received: from [89.243.191.101] (helo=[192.168.1.37]) by smtp.hosts.co.uk with esmtpa (Exim) (envelope-from ) id 1jX6gW-0003jr-FP; Fri, 08 May 2020 18:21:17 +0100 Subject: Re: [PATCH] rebase --autosquash: fix a potential segfault To: Andrei Rybak , Johannes Schindelin Cc: Johannes Schindelin via GitGitGadget , git@vger.kernel.org, Paul Ganssle , Jeff King References: <2367cf9d-2e37-b8c2-6881-f3e6c951a460@gmail.com> <1a03a7b4-f436-83c5-f825-3b68c07785e9@iee.email> <4f2ddbba-a9ba-a96a-36c1-b233ea861575@gmail.com> From: Philip Oakley Message-ID: Date: Fri, 8 May 2020 18:21:15 +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: <4f2ddbba-a9ba-a96a-36c1-b233ea861575@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-GB Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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! ` 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