Skip to content

Commit 6e3b034

Browse files
avargitster
authored andcommitted
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 a51d37c (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 f0e588d (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c7c9692 commit 6e3b034

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

git-instaweb.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -380,10 +380,7 @@ TypesConfig "$fqgitdir/mime.types"
380380
DirectoryIndex gitweb.cgi
381381
EOF
382382

383-
# check to see if Dennis Stosberg's mod_perl compatibility patch
384-
# (<[email protected]>) has been applied
385-
if test -f "$module_path/mod_perl.so" &&
386-
sane_grep 'MOD_PERL' "$root/gitweb.cgi" >/dev/null
383+
if test -f "$module_path/mod_perl.so"
387384
then
388385
# favor mod_perl if available
389386
cat >> "$conf" <<EOF

0 commit comments

Comments
 (0)