Skip to content

Commit 9aea5e9

Browse files
avargitster
authored andcommitted
rebase: fix regression in rebase.useBuiltin=false test mode
Fix a recently introduced regression in c762aad ("rebase -x: sanity check command", 2019-01-29) triggered when running the tests with GIT_TEST_REBASE_USE_BUILTIN=false. See 62c2393 ("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/[email protected]/ Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e9bd4aa commit 9aea5e9

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

t/t3404-rebase-interactive.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,18 +149,21 @@ test_expect_success 'rebase -i with the exec command checks tree cleanness' '
149149

150150
test_expect_success 'rebase -x with empty command fails' '
151151
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 &&
153154
test_write_lines "error: empty exec command" >expected &&
154155
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 &&
156158
test_i18ncmp expected actual
157159
'
158160

159161
LF='
160162
'
161163
test_expect_success 'rebase -x with newline in command fails' '
162164
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 &&
164167
test_write_lines "error: exec commands cannot contain newlines" \
165168
>expected &&
166169
test_i18ncmp expected actual

0 commit comments

Comments
 (0)