]> git.ipfire.org Git - thirdparty/git.git/commit - sequencer.c
sequencer (rebase -i): allow rescheduling commands
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 2 Jan 2017 15:28:34 +0000 (16:28 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jan 2017 22:57:30 +0000 (14:57 -0800)
commit9d7bf3cf993ab59e0f9d7150534213f57dd12741
tree5894bfc7cbecbfcbf478bcb285ebcb19867bbbed
parentca6c6b45dd9c36ae3e0b4f1fc9812d1e6a8b59bc
sequencer (rebase -i): allow rescheduling commands

The interactive rebase has the very special magic that a cherry-pick
that exits with a status different from 0 and 1 signifies a failure to
even record that a cherry-pick was started.

This can happen e.g. when a fast-forward fails because it would
overwrite untracked files.

In that case, we must reschedule the command that we thought we already
had at least started successfully.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c