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

Re: [PATCH 0/2] builtin/history: introduce "fixup" subcommand

From
Tian Yuchen <cat@malon.dev>
Date
Apr 22, 2026, 18:18 UTC
Message-ID
<d2b19306-71e9-4e17-a0c0-83309a00bd45@malon.dev>
In-Reply-To
<20260422-b4-pks-history-fixup-v1-0-48d4484243de@pks.im>
Hi Patrick,
On 4/22/26 18:28, Patrick Steinhardt wrote:
Show 16 quoted lines
> Hi,
> 
> this short patch series introduces a new "fixup" subcommand. This
> command is the first one that I felt is missing in my day to day work,
> as I end up doing fixup commits quite often.
> 
> The flow is rather simple: the user stages some changes, and then they
> execute `git history fixup <commit>` to amend those changes to the given
> commit. As with the other subcommands, dependent branches will then be
> rebased automatically.
> 
> This is the first command that may result in merge conflicts. For now we
> simply abort in such cases, but there are plans to introduce first-class
> conflicts into Git. So once we have them, we'll also be able to handle
> such cases more gracefully. I still think that the command is useful
> even without that conflict handling.
Thank you for developing this feature. Godsend for lazy people like me ;)

Nevertheless, I seem to have come across what appears to be a bug. I carried out the following steps:

	create a.txt -> git add -> git commit -m "base" ->
	create b.txt -> git add -> git commit -m "feature" ->
	create c.txt -> git add -> git commit -m "tip" ->
	rm b.txt -> git add ->
	git history fixup HEAD~ ->
	git log --oneline --stat...
And the output looks like:
	3096a65 (HEAD -> master) tip
	 c.txt | 1 +
	 1 file changed, 1 insertion(+)
	699f610 feature
	0be07e6 base
	 a.txt | 1 +
  	1 file changed, 1 insertion(+)
More specifically, the output of
	git show HEAD~
is:
	Author: Tian Yuchen <cat@malon.dev>
	Date:   Thu Apr 23 01:57:17 2026 +0800
  	   feature

which is an empty commit. Is it what we expect to see? Sorry that I don't have enough time to look at the code in detail :P

Thanks, Yuchen
Previous: D. Ben KnobleNext: Patrick Steinhardt
Message 9 of 17 in “builtin/history: introduce "fixup" subcommand”
  1. 0/2 builtin/history: introduce "fixup" subcommandPatrick Steinhardt, Apr 22, 2026
  2. 1/2 builtin/history: generalize function to commit treesPatrick Steinhardt, Apr 22, 2026
  3. 2/2 builtin/history: introduce "fixup" subcommandPatrick Steinhardt, Apr 22, 2026
  4. D. Ben KnobleApr 22, 2026
  5. Patrick SteinhardtApr 23, 2026
  6. D. Ben KnobleApr 23, 2026
  7. Patrick SteinhardtApr 24, 2026
  8. D. Ben KnobleApr 24, 2026
  9. Tian YuchenApr 22, 2026
  10. Patrick SteinhardtApr 23, 2026
  11. 0/3 builtin/history: introduce "fixup" subcommandPatrick Steinhardt, Apr 27, 2026
  12. 1/3 replay: allow callers to control what happens with empty commitsPatrick Steinhardt, Apr 27, 2026
  13. Junio C HamanoMay 12, 2026
  14. 2/3 builtin/history: generalize function to commit treesPatrick Steinhardt, Apr 27, 2026
  15. 3/3 builtin/history: introduce "fixup" subcommandPatrick Steinhardt, Apr 27, 2026
  16. Junio C HamanoMay 12, 2026
  17. Patrick SteinhardtMay 12, 2026

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.