diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-12-10 19:04:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-11 08:19:01 (GMT) |
| commit | d421afa0c66ec6bbd15602d534f77546c516f2a5 (patch) | |
| tree | 723714ec4901aeb6facf61094e98d3728631c80f /t/t3418-rebase-continue.sh | |
| parent | 5d826e972970a784bd7a7bdf587512510097b8c7 (diff) | |
| download | git-d421afa0c66ec6bbd15602d534f77546c516f2a5.zip git-d421afa0c66ec6bbd15602d534f77546c516f2a5.tar.gz git-d421afa0c66ec6bbd15602d534f77546c516f2a5.tar.bz2 | |
rebase: introduce --reschedule-failed-exec
A common use case for the `--exec` option is to verify that each commit
in a topic branch compiles cleanly, via `git rebase -x make <base>`.
However, when an `exec` in such a rebase fails, it is not re-scheduled,
which in this instance is not particularly helpful.
Let's offer a flag to reschedule failed `exec` commands.
Based on an idea by Paul Morelle.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3418-rebase-continue.sh')
| -rwxr-xr-x | t/t3418-rebase-continue.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index 0210b2a..54b26a9 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -254,4 +254,10 @@ test_expect_success 'the todo command "break" works' ' test_path_is_file execed ' +test_expect_success '--reschedule-failed-exec' ' + test_when_finished "git rebase --abort" && + test_must_fail git rebase -x false --reschedule-failed-exec HEAD^ && + grep "^exec false" .git/rebase-merge/git-rebase-todo +' + test_done |