diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-02-13 18:18:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-13 18:18:43 -0800 |
| commit | 6e4718857eb5d5b068a5ca4e0a01c624d66f8c01 (patch) | |
| tree | 1bed260bae7e58e138b64d57d1150ec281dffd1a | |
| parent | Merge branch 'rb/no-dev-zero-in-test' (diff) | |
| parent | rebase: fix regression in rebase.useBuiltin=false test mode (diff) | |
| download | tgif-6e4718857eb5d5b068a5ca4e0a01c624d66f8c01.tar.xz | |
Merge branch 'ab/rebase-test-fix'
* ab/rebase-test-fix:
rebase: fix regression in rebase.useBuiltin=false test mode
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 9 |
1 files 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 |