]> git.ipfire.org Git - thirdparty/git.git/commit
sequencer: never reschedule on failed commit
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Tue, 30 Jun 2026 15:28:54 +0000 (16:28 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Jun 2026 19:03:14 +0000 (12:03 -0700)
commit8b7330ca47261e414dd72e6ee6233dbb355ce7cf
tree7771e9ce20af3614cbeb62e79711d298d742db33
parenta24c41eeebb2bc8031bf3fdfcff57cb0410f90c8
sequencer: never reschedule on failed commit

If "git commit" fails to run then run_git_commit() returns -1 which
causes the current command to be rescheduled. This is incorrect as
we have successfully picked the commit and have written all the state
files we need to successfully commit when the user continues. Fix this
by converting -1 to 1 which matches what do_merge() does.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c