Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit e834fa0

Browse files
committed
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
2 parents 2fa4fff + 0754e08 commit e834fa0

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

git-relink.perl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env perl
1+
#!/usr/bin/perl
22
# Copyright 2005, Ryan Anderson <[email protected]>
33
# Distribution permitted under the GPL v2, as distributed
44
# by the Free Software Foundation.

git-svn.perl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env perl
1+
#!/usr/bin/perl
22
# Copyright (C) 2006, Eric Wong <[email protected]>
33
# License: GPL v2 or later
44
use 5.008;

t/gitweb-lib.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ gitweb_run () {
6969
# written to web server logs, so we are not interested in that:
7070
# we are interested only in properly formatted errors/warnings
7171
rm -f gitweb.log &&
72-
perl -- "$SCRIPT_NAME" \
72+
"$PERL_PATH" -- "$SCRIPT_NAME" \
7373
>gitweb.output 2>gitweb.log &&
7474
perl -w -e '
7575
open O, ">gitweb.headers";

0 commit comments

Comments
 (0)