summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2019-02-13 21:49:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-02-13 23:16:21 (GMT)
commit9aea5e92863f1920260b97cb3fe073fd8a43bb28 (patch)
treee26d6091483209baeab3ecb6d4583c07b151dbf1 /t
parente9bd4aa026178caeed76ca00d9034c9dfdb3eefb (diff)
downloadgit-9aea5e92863f1920260b97cb3fe073fd8a43bb28.zip
git-9aea5e92863f1920260b97cb3fe073fd8a43bb28.tar.gz
git-9aea5e92863f1920260b97cb3fe073fd8a43bb28.tar.bz2
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>
Diffstat (limited to 't')
-rwxr-xr-xt/t3404-rebase-interactive.sh9
1 files changed, 6 insertions, 3 deletions
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 -i with the exec command checks tree cleanness' '
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 @@ LF='
'
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