mirror of
https://github.com/git/git.git
synced 2024-11-18 04:14:01 +01:00
94221d2203
As of the last commit, we can use "perl" instead of "$PERL_PATH" when running tests, as the former is now a function which uses the latter. As the shorter "perl" is easier on the eyes, let's switch to using it everywhere. This is not quite a mechanical s/$PERL_PATH/perl/ replacement, though. There are some places where we invoke perl from a script we generate on the fly, and those scripts do not have access to our internal shell functions. The result can be double-checked by running: ln -s /bin/false bin-wrappers/perl make test which continues to pass even after this patch. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
40 lines
792 B
Bash
Executable File
40 lines
792 B
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) Jim Meyering
|
|
#
|
|
test_description='diff honors config option, diff.suppressBlankEmpty'
|
|
|
|
. ./test-lib.sh
|
|
|
|
cat <<\EOF > exp ||
|
|
diff --git a/f b/f
|
|
index 5f6a263..8cb8bae 100644
|
|
--- a/f
|
|
+++ b/f
|
|
@@ -1,2 +1,2 @@
|
|
|
|
-x
|
|
+y
|
|
EOF
|
|
exit 1
|
|
|
|
test_expect_success \
|
|
"$test_description" \
|
|
'printf "\nx\n" > f &&
|
|
git add f &&
|
|
git commit -q -m. f &&
|
|
printf "\ny\n" > f &&
|
|
git config --bool diff.suppressBlankEmpty true &&
|
|
git diff f > actual &&
|
|
test_cmp exp actual &&
|
|
perl -i.bak -p -e "s/^\$/ /" exp &&
|
|
git config --bool diff.suppressBlankEmpty false &&
|
|
git diff f > actual &&
|
|
test_cmp exp actual &&
|
|
git config --bool --unset diff.suppressBlankEmpty &&
|
|
git diff f > actual &&
|
|
test_cmp exp actual
|
|
'
|
|
|
|
test_done
|