aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com> 2021-10-21 21:57:58 +0200
committerGravatar Junio C Hamano <gitster@pobox.com> 2021-10-21 16:17:57 -0700
commit6e3b0348a442afc58ca02259d476732c18ac26d0 (patch)
tree49680f5b2b598cc78e174e96cfa9aa6cf4151b01
parentc7c969289792f9fbc4cfd9850bb228b4c9cd967e (diff)
downloadgit-6e3b0348a442afc58ca02259d476732c18ac26d0.tar.gz
git-6e3b0348a442afc58ca02259d476732c18ac26d0.zip
git-instaweb: unconditionally assume that gitweb is mod_perl capable
Remove a check for whether mod_perl is a supported mode of gitweb.cgi added in a51d37c1df6 (Add git-instaweb, instantly browse the working repo with gitweb, 2006-07-01). The reason for the check was to support users who had a newer version of git and an older version of gitweb, it was then subsequently adjusted for changes in the script in f0e588dffc1 (git-instaweb: fix mod_perl detection for apache2, 2009-08-08). It's a fair bet that nobody's running a git from 2021 and gitweb from pre-2007 anymore, so we can unconditionally assume that this will be supported by gitweb.cgi. This allows a subsequent commit to remove the sane_grep() wrapper, this change is split up from that since this is the only case where the "grep" invocation could be removed entirely. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-instaweb.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/git-instaweb.sh b/git-instaweb.sh
index 7c55229773..54094fbe8d 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -380,10 +380,7 @@ TypesConfig "$fqgitdir/mime.types"
DirectoryIndex gitweb.cgi
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" &&
- sane_grep 'MOD_PERL' "$root/gitweb.cgi" >/dev/null
+ if test -f "$module_path/mod_perl.so"
then
# favor mod_perl if available
cat >> "$conf" <<EOF