Skip to content

Commit

Permalink
Merge branch 'jk/maint-gitweb-test-use-sane-perl' into maint
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gitster committed May 7, 2012
2 parents 6a88021 + 0754e08 commit dc813f6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion git-relink.perl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env perl
#!/usr/bin/perl
# Copyright 2005, Ryan Anderson <[email protected]>
# Distribution permitted under the GPL v2, as distributed
# by the Free Software Foundation.
Expand Down
2 changes: 1 addition & 1 deletion git-svn.perl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env perl
#!/usr/bin/perl
# Copyright (C) 2006, Eric Wong <[email protected]>
# License: GPL v2 or later
use 5.008;
Expand Down
2 changes: 1 addition & 1 deletion t/gitweb-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down

0 comments on commit dc813f6

Please sign in to comment.