diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-07-22 12:59:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-22 12:59:56 -0700 |
| commit | bb3ed291a6cfd4ed58773f2158f3ae32baf066e0 (patch) | |
| tree | 9d8281ef421c7ee7d71426954fd9c829e803d5b6 /t/t4029-diff-trailing-space.sh | |
| parent | Git 1.7.11.2 (diff) | |
| parent | t/README: add a bit more Don'ts (diff) | |
| download | tgif-bb3ed291a6cfd4ed58773f2158f3ae32baf066e0.tar.xz | |
Merge branch 'vr/use-our-perl-in-tests' into maint
Some implementations of Perl terminates "lines" with CRLF even when
the script is operating on just a sequence of bytes. Make sure to
use "$PERL_PATH", the version of Perl the user told Git to use, in
our tests to avoid unnecessary breakages in tests.
* vr/use-our-perl-in-tests:
t/README: add a bit more Don'ts
tests: enclose $PERL_PATH in double quotes
t/test-lib.sh: export PERL_PATH for use in scripts
t: Replace 'perl' by $PERL_PATH
Diffstat (limited to 't/t4029-diff-trailing-space.sh')
| -rwxr-xr-x | t/t4029-diff-trailing-space.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4029-diff-trailing-space.sh b/t/t4029-diff-trailing-space.sh index 3ccc237a8d..36e2f075c9 100755 --- a/t/t4029-diff-trailing-space.sh +++ b/t/t4029-diff-trailing-space.sh @@ -27,7 +27,7 @@ test_expect_success \ git config --bool diff.suppressBlankEmpty true && git diff f > actual && test_cmp exp actual && - perl -i.bak -p -e "s/^\$/ /" exp && + "$PERL_PATH" -i.bak -p -e "s/^\$/ /" exp && git config --bool diff.suppressBlankEmpty false && git diff f > actual && test_cmp exp actual && |