git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
May 7, 2020, 14:27 UTC
Message-ID
<nycvar.QRO.7.76.6.2005071626340.56@tvgsbejvaqbjf.bet>
In-Reply-To
<2367cf9d-2e37-b8c2-6881-f3e6c951a460@gmail.com>
Hi Andrei,
On Wed, 6 May 2020, Andrei Rybak wrote:
Show 25 quoted lines
> 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

Previous: Andrei RybakNext: Philip Oakley
Message 12 of 23 in “rebase --autosquash: fix a potential segfault”
  1. rebase --autosquash: fix a potential segfaultJohannes Schindelin via GitGitGadget, May 4, 2020
  2. Junio C HamanoMay 4, 2020
  3. Jeff KingMay 4, 2020
  4. Taylor BlauMay 4, 2020
  5. Junio C HamanoMay 5, 2020
  6. Johannes SchindelinMay 6, 2020
  7. Jeff KingMay 7, 2020
  8. Johannes SchindelinMay 8, 2020
  9. rebase --autosquash: fix a potential segfaultJohannes Schindelin via GitGitGadget, May 5, 2020
  10. rebase --autosquash: fix a potential segfaultJohannes Schindelin via GitGitGadget, May 9, 2020
  11. Andrei RybakMay 6, 2020
  12. Johannes SchindelinMay 7, 2020
  13. Philip OakleyMay 8, 2020
  14. Andrei RybakMay 8, 2020
  15. Philip OakleyMay 8, 2020
  16. Philip OakleyMay 18, 2020
  17. Johannes SchindelinMay 18, 2020
  18. Philip OakleyMay 25, 2020
  19. 0/2 Clarify some of the fixup! documenationPhilip Oakley, May 25, 2020
  20. 2/2 doc: fixup/squash: remove ellipsis marks, use <line> for clarifyPhilip Oakley, May 25, 2020
  21. 1/2 doc: fixup/squash: clarify use of <oid-hash> in subject linePhilip Oakley, May 25, 2020
  22. Junio C HamanoMay 27, 2020
  23. Philip OakleyMay 29, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.