git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Philip Oakley <philipoakley@iee.email>
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>
Subject: Re: [PATCH] rebase --autosquash: fix a potential segfault
Date: Fri, 8 May 2020 17:43:53 +0100	[thread overview]
Message-ID: <1a03a7b4-f436-83c5-f825-3b68c07785e9@iee.email> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.2005071626340.56@tvgsbejvaqbjf.bet>

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


  reply	other threads:[~2020-05-08 16:43 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-04 20:40 [PATCH] rebase --autosquash: fix a potential segfault Johannes Schindelin via GitGitGadget
2020-05-04 21:19 ` Junio C Hamano
2020-05-04 21:33 ` Jeff King
2020-05-04 22:09   ` Taylor Blau
2020-05-05 20:30     ` Junio C Hamano
2020-05-06 21:35       ` Johannes Schindelin
2020-05-07 19:17         ` Jeff King
2020-05-08 23:45           ` Johannes Schindelin
2020-05-05 22:33 ` [PATCH v2] " Johannes Schindelin via GitGitGadget
2020-05-09 19:23   ` [PATCH v3] " Johannes Schindelin via GitGitGadget
2020-05-06 15:12 ` [PATCH] " Andrei Rybak
2020-05-07 14:27   ` Johannes Schindelin
2020-05-08 16:43     ` Philip Oakley [this message]
2020-05-08 16:57       ` Andrei Rybak
2020-05-08 17:21         ` Philip Oakley
2020-05-18 16:47         ` Philip Oakley
2020-05-18  3:27           ` Johannes Schindelin
2020-05-25 17:29             ` Philip Oakley
2020-05-25 21:36               ` [PATCH 0/2] Clarify some of the fixup! documenation Philip Oakley
2020-05-25 21:36                 ` [PATCH 1/2] doc: fixup/squash: clarify use of <oid-hash> in subject line Philip Oakley
2020-05-27 17:35                   ` Junio C Hamano
2020-05-29 11:41                     ` Philip Oakley
2020-05-25 21:36                 ` [PATCH 2/2] doc: fixup/squash: remove ellipsis marks, use <line> for clarify Philip Oakley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1a03a7b4-f436-83c5-f825-3b68c07785e9@iee.email \
    --to=philipoakley@iee.email \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=paul@ganssle.io \
    --cc=peff@peff.net \
    --cc=rybak.a.v@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).