summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-01-29 12:47:53 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-01-29 12:47:53 -0800
commitd9d9ab0876e5ba82996852e7033b2fb29c970914 (patch)
treecc49fab5940cb3370d3c701d46589c055a0bb1c5 /t
parentMerge branch 'cc/fetch-error-message-fix' (diff)
parentrebase: introduce a shortcut for --reschedule-failed-exec (diff)
downloadtgif-d9d9ab0876e5ba82996852e7033b2fb29c970914.tar.xz
Merge branch 'js/rebase-i-redo-exec'
"git rebase -i" learned to re-execute a command given with 'exec' to run after it failed the last time. * js/rebase-i-redo-exec: rebase: introduce a shortcut for --reschedule-failed-exec rebase: add a config option to default to --reschedule-failed-exec rebase: introduce --reschedule-failed-exec
Diffstat (limited to 't')
-rwxr-xr-xt/t3418-rebase-continue.sh14
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh
index 0210b2ac6f..25aaacacfc 100755
--- a/t/t3418-rebase-continue.sh
+++ b/t/t3418-rebase-continue.sh
@@ -254,4 +254,18 @@ 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 &&
+ git rebase --abort &&
+ test_must_fail git -c rebase.rescheduleFailedExec=true \
+ rebase -x false HEAD^ 2>err &&
+ grep "^exec false" .git/rebase-merge/git-rebase-todo &&
+ test_i18ngrep "has been rescheduled" err &&
+ git rebase --abort &&
+ test_must_fail git rebase -y false HEAD^ 2>err &&
+ test_i18ngrep "has been rescheduled" err
+'
+
test_done