Merge branch 'mz/oneway-merge-wo-u-no-lstat'

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 6eafb634656ee67bbc3fc8869a5a4ee6d647112b..32fdc9938e1dc29d9a1c6c1dd54379ee33644561 100755 (executable)
--- 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 &&