mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'jk/use-perl-path-consistently'
Tests had a few places where we ignored PERL_PATH and blindly used /usr/bin/perl, which have been corrected. * jk/use-perl-path-consistently: t/lib-httpd: pass PERL_PATH to CGI scripts
This commit is contained in:
commit
063cd850f2
|
@ -101,6 +101,8 @@ PassEnv LC_ALL
|
||||||
Alias /dumb/ www/
|
Alias /dumb/ www/
|
||||||
Alias /auth/dumb/ www/auth/dumb/
|
Alias /auth/dumb/ www/auth/dumb/
|
||||||
|
|
||||||
|
SetEnv PERL_PATH ${PERL_PATH}
|
||||||
|
|
||||||
<LocationMatch /smart/>
|
<LocationMatch /smart/>
|
||||||
SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
|
SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
|
||||||
SetEnv GIT_HTTP_EXPORT_ALL
|
SetEnv GIT_HTTP_EXPORT_ALL
|
||||||
|
|
|
@ -13,7 +13,7 @@ then
|
||||||
export LC_ALL
|
export LC_ALL
|
||||||
|
|
||||||
"$GIT_EXEC_PATH/git-http-backend" >out
|
"$GIT_EXEC_PATH/git-http-backend" >out
|
||||||
perl -pe "$(cat one-time-perl)" out >out_modified
|
"$PERL_PATH" -pe "$(cat one-time-perl)" out >out_modified
|
||||||
|
|
||||||
if cmp -s out out_modified
|
if cmp -s out out_modified
|
||||||
then
|
then
|
||||||
|
|
Loading…
Reference in a new issue