Merge branch 'ab/rebase-test-fix'
* ab/rebase-test-fix:
rebase: fix regression in rebase.useBuiltin=false test mode
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 52fa41c..b60b11f 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -149,10 +149,12 @@
test_expect_success 'rebase -x with empty command fails' '
test_when_finished "git rebase --abort ||:" &&
- test_must_fail git rebase -x "" @ 2>actual &&
+ test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=true \
+ git rebase -x "" @ 2>actual &&
test_write_lines "error: empty exec command" >expected &&
test_i18ncmp expected actual &&
- test_must_fail git rebase -x " " @ 2>actual &&
+ test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=true \
+ git rebase -x " " @ 2>actual &&
test_i18ncmp expected actual
'
@@ -160,7 +162,8 @@
'
test_expect_success 'rebase -x with newline in command fails' '
test_when_finished "git rebase --abort ||:" &&
- test_must_fail git rebase -x "a${LF}b" @ 2>actual &&
+ test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=true \
+ git rebase -x "a${LF}b" @ 2>actual &&
test_write_lines "error: exec commands cannot contain newlines" \
>expected &&
test_i18ncmp expected actual
