diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-09 04:44:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-09 04:44:52 (GMT) |
| commit | b966813e716504252ea26a635db21aa628e3dbd8 (patch) | |
| tree | 9e1164f754db4e0b9b793d7cd79eb4d285279e5f /t | |
| parent | 87c9831df0f5ae4e96ab2e5b9b5b50505baa8cf4 (diff) | |
| parent | e11ff8975bedc0aae82632c3cb72578c3d7fc0b2 (diff) | |
| download | git-b966813e716504252ea26a635db21aa628e3dbd8.zip git-b966813e716504252ea26a635db21aa628e3dbd8.tar.gz git-b966813e716504252ea26a635db21aa628e3dbd8.tar.bz2 | |
Merge branch 'js/rebase-i-redo-exec-fix'
For "rebase -i --reschedule-failed-exec", we do not want the "-y"
shortcut after all.
* js/rebase-i-redo-exec-fix:
Revert "rebase: introduce a shortcut for --reschedule-failed-exec"
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3418-rebase-continue.sh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index 25aaaca..bdaa511 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -262,9 +262,6 @@ test_expect_success '--reschedule-failed-exec' ' 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 ' |