aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-02 13:53:40 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-02 13:53:40 -0700
commite834fa0d5cb73900031cae94159534a15c114e50 (patch)
treee5ca97c1f981d1deeafd899eb0126667220d36c0
parent2fa4fff4b9ba9998685c0b38cbadb49ac38734ce (diff)
parent0754e089c1ffc6a40574eee0564ef98b3acacc26 (diff)
downloadgit-e834fa0d5cb73900031cae94159534a15c114e50.tar.gz
git-e834fa0d5cb73900031cae94159534a15c114e50.tar.xz
Merge branch 'jk/maint-gitweb-test-use-sane-perl'
When using a Perl script on a system where "perl" found on user's $PATH could be ancient or otherwise broken, we allow builders to specify the path to a good copy of Perl with $PERL_PATH. The gitweb test forgot to use that Perl when running its test. By Jeff King (1) and Zbigniew Jędrzejewski-Szmek (1) * jk/maint-gitweb-test-use-sane-perl: Consistently use perl from /usr/bin/ for scripts t/gitweb-lib: use $PERL_PATH to run gitweb
-rwxr-xr-xgit-relink.perl2
-rwxr-xr-xgit-svn.perl2
-rw-r--r--t/gitweb-lib.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/git-relink.perl b/git-relink.perl
index e136732ce..f29285c41 100755
--- a/git-relink.perl
+++ b/git-relink.perl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
# Copyright 2005, Ryan Anderson <ryan@michonline.com>
# Distribution permitted under the GPL v2, as distributed
# by the Free Software Foundation.
diff --git a/git-svn.perl b/git-svn.perl
index 427da9e7a..9bec80829 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
# Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
# License: GPL v2 or later
use 5.008;
diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh
index 21d11d6c2..ae2dc4604 100644
--- a/t/gitweb-lib.sh
+++ b/t/gitweb-lib.sh
@@ -69,7 +69,7 @@ gitweb_run () {
# written to web server logs, so we are not interested in that:
# we are interested only in properly formatted errors/warnings
rm -f gitweb.log &&
- perl -- "$SCRIPT_NAME" \
+ "$PERL_PATH" -- "$SCRIPT_NAME" \
>gitweb.output 2>gitweb.log &&
perl -w -e '
open O, ">gitweb.headers";