summaryrefslogtreecommitdiff
path: root/git-instaweb.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-08-10 22:23:59 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-08-10 22:23:59 -0700
commitefd17968387482f5765a969813707629b85bf74f (patch)
tree00bbc3ee10846f5131f2a42244b8276ec366e9f4 /git-instaweb.sh
parentMerge branch 'jk/push-quiet' (diff)
parentMerge branch 'maint-1.6.3' into maint (diff)
downloadtgif-efd17968387482f5765a969813707629b85bf74f.tar.xz
Merge branch 'maint'
* maint: Fix typos in git-remote.txt and git-symbolic-ref.txt git-instaweb: fix mod_perl detection for apache2
Diffstat (limited to 'git-instaweb.sh')
-rwxr-xr-xgit-instaweb.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-instaweb.sh b/git-instaweb.sh
index 32f6496b0d..5f5cac75ea 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -278,7 +278,7 @@ EOF
# check to see if Dennis Stosberg's mod_perl compatibility patch
# (<20060621130708.Gcbc6e5c@leonov.stosberg.net>) has been applied
- if test -f "$module_path/mod_perl.so" && grep '^our $gitbin' \
+ if test -f "$module_path/mod_perl.so" && grep 'MOD_PERL' \
"$GIT_DIR/gitweb/gitweb.cgi" >/dev/null
then
# favor mod_perl if available