diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-30 05:28:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-30 05:28:05 (GMT) |
| commit | f5fd2a7d179a8bb843ec44d2a594e6ccf50dfb3a (patch) | |
| tree | 212e3cc2b4d1f342b236af4f5827e066fc5e3ef3 /t | |
| parent | a275e823aceff5ddb5a49d4bfd1a0e96da312597 (diff) | |
| parent | ecfe1ea96fde1fa5756ad04f717fd2960ead988a (diff) | |
| download | git-f5fd2a7d179a8bb843ec44d2a594e6ccf50dfb3a.zip git-f5fd2a7d179a8bb843ec44d2a594e6ccf50dfb3a.tar.gz git-f5fd2a7d179a8bb843ec44d2a594e6ccf50dfb3a.tar.bz2 | |
Merge branch 'js/rebase-exec-command-not-found'
* js/rebase-exec-command-not-found:
rebase -i: fix misleading error message after 'exec no-such' instruction
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 7304b66..7a71760 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -118,6 +118,17 @@ test_expect_success 'rebase -i with the exec command checks tree cleanness' ' git rebase --continue ' +test_expect_success 'rebase -i with exec of inexistent command' ' + git checkout master && + test_when_finished "git rebase --abort" && + ( + FAKE_LINES="exec_this-command-does-not-exist 1" && + export FAKE_LINES && + test_must_fail git rebase -i HEAD^ >actual 2>&1 + ) && + ! grep "Maybe git-rebase is broken" actual +' + test_expect_success 'no changes are a nop' ' git checkout branch2 && git rebase -i F && |