diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2026-07-15 16:21:57 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-07-15 12:16:21 -0700 |
| commit | 18f5750beb14c13f1a140361b6a0459764ec0364 (patch) | |
| tree | 42ef1edacd61709b3665c41ad38f603855ebd6e3 /t/t4013/diff.diff_initial..side | |
| parent | 1da85922fddd6f693739385fa08c0d15ad066247 (diff) | |
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>
Diffstat (limited to 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions