rebase: fix regression in rebase.useBuiltin=false test mode
Fix a recently introduced regression in c762aada1a ("rebase -x: sanity check command", 2019-01-29) triggered when running the tests with GIT_TEST_REBASE_USE_BUILTIN=false. See 62c23938fa ("tests: add a special setup where rebase.useBuiltin is off", 2018-11-14) for how that test mode works. As discussed on-list[1] it's not worth it to implement the sanity check in the legacy rebase code, we plan to remove it after the 2.21 release. So let's do the bare minimum to make the tests pass under the GIT_TEST_REBASE_USE_BUILTIN=false special setup. 1. https://public-inbox.org/git/xmqqva1nbeno.fsf@gitster-ct.c.googlers.com/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Feb 13, 2019 at 22:49 UTC
9aea5e92863f1920260b97cb3fe073fd8a43bb28
1 file changed
+6
-3
t/t3404-rebase-interactive.sh
+6
-3
@@ -149,10 +149,12 @@ test_expect_success 'rebase -i with the exec command checks tree cleanness' '
149
150
test_expect_success 'rebase -x with empty command fails' '
151
test_when_finished "git rebase --abort ||:" &&
152
- test_must_fail git rebase -x "" @ 2>actual &&
152
+ test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=true \
153
+ git rebase -x "" @ 2>actual &&
154
test_write_lines "error: empty exec command" >expected &&
155
test_i18ncmp expected actual &&
155
- test_must_fail git rebase -x " " @ 2>actual &&
156
+ test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=true \
157
+ git rebase -x " " @ 2>actual &&
158
test_i18ncmp expected actual
159
'
160
@@ -160,7 +162,8 @@ LF='
162
'
163
test_expect_success 'rebase -x with newline in command fails' '
164
test_when_finished "git rebase --abort ||:" &&
163
- test_must_fail git rebase -x "a${LF}b" @ 2>actual &&
165
+ test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=true \
166
+ git rebase -x "a${LF}b" @ 2>actual &&
167
test_write_lines "error: exec commands cannot contain newlines" \
168
>expected &&
169
test_i18ncmp expected actual