summaryrefslogtreecommitdiff
path: root/t/t4200-rerere.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2013-10-29 01:23:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-10-29 19:45:15 (GMT)
commit94221d22036f36e10680c0a1e7eafb4bceeb1248 (patch)
tree7dddfd50625aafbc99b3e6c8e9b824dceb4f1a2b /t/t4200-rerere.sh
parenta0e0ec9f7dd2ad46459cf98b7465b007fb15258b (diff)
downloadgit-94221d22036f36e10680c0a1e7eafb4bceeb1248.zip
git-94221d22036f36e10680c0a1e7eafb4bceeb1248.tar.gz
git-94221d22036f36e10680c0a1e7eafb4bceeb1248.tar.bz2
t: use perl instead of "$PERL_PATH" where applicable
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>
Diffstat (limited to 't/t4200-rerere.sh')
-rwxr-xr-xt/t4200-rerere.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 7f6666f..076e770 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -78,7 +78,7 @@ test_expect_success 'activate rerere, old style (conflicting merge)' '
test_might_fail git config --unset rerere.enabled &&
test_must_fail git merge first &&
- sha1=$("$PERL_PATH" -pe "s/ .*//" .git/MERGE_RR) &&
+ sha1=$(perl -pe "s/ .*//" .git/MERGE_RR) &&
rr=.git/rr-cache/$sha1 &&
grep "^=======\$" $rr/preimage &&
! test -f $rr/postimage &&
@@ -91,7 +91,7 @@ test_expect_success 'rerere.enabled works, too' '
git reset --hard &&
test_must_fail git merge first &&
- sha1=$("$PERL_PATH" -pe "s/ .*//" .git/MERGE_RR) &&
+ sha1=$(perl -pe "s/ .*//" .git/MERGE_RR) &&
rr=.git/rr-cache/$sha1 &&
grep ^=======$ $rr/preimage
'
@@ -101,7 +101,7 @@ test_expect_success 'set up rr-cache' '
git config rerere.enabled true &&
git reset --hard &&
test_must_fail git merge first &&
- sha1=$("$PERL_PATH" -pe "s/ .*//" .git/MERGE_RR) &&
+ sha1=$(perl -pe "s/ .*//" .git/MERGE_RR) &&
rr=.git/rr-cache/$sha1
'
@@ -185,7 +185,7 @@ test_expect_success 'rerere updates postimage timestamp' '
test_expect_success 'rerere clear' '
rm $rr/postimage &&
- echo "$sha1 a1" | "$PERL_PATH" -pe "y/\012/\000/" >.git/MERGE_RR &&
+ echo "$sha1 a1" | perl -pe "y/\012/\000/" >.git/MERGE_RR &&
git rerere clear &&
! test -d $rr
'