diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2019-02-15 10:09:07 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2019-02-15 10:09:07 +0800 |
| commit | a603d9406e6b4e8087b44a1b3c988b5f007ea770 (patch) | |
| tree | 4f1929916d9500ec76596e0774df47b379b792d1 /t/t3404-rebase-interactive.sh | |
| parent | 94328ceff010fc6df89c062a1e3a2561e719cb53 (diff) | |
| parent | 2d08f3deb9feb73dc8d21d75bfd367839fc1322c (diff) | |
| download | git-a603d9406e6b4e8087b44a1b3c988b5f007ea770.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -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 |