Ævar Arnfjörð Bjarmason <[email protected]> writes:
> Let's do this for 2.21 then and I'll re-submit the legacy removal
> patch after we start 2.22.
OK, I would have thought that a prereq to check if the environment
is set and skip these problematic tests would be a lot cleaner
(primarily because the "legacy removal" patch will not touch the
body of the tests at all), but for just the coming few weeks, this
would suffice.
Thanks.
>
> t/t3404-rebase-interactive.sh | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
> index 52fa41c707..b60b11f9f2 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
