From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 4/6] git-instaweb: unconditionally assume that gitweb is mod_perl capable
Date: Thu, 21 Oct 2021 21:57:58 +0200 [thread overview]
Message-ID: <patch-4.6-4feeeb12aca-20211021T195538Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-0.6-00000000000-20211021T195538Z-avarab@gmail.com>
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>
---
git-instaweb.sh | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/git-instaweb.sh b/git-instaweb.sh
index 7c55229773e..54094fbe8de 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
--
2.33.1.1494.g88b39a443e1
next prev parent reply other threads:[~2021-10-21 19:58 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-21 19:57 [PATCH 0/6] Makefile: be less eager to re-build, *.sh code cleanups Ævar Arnfjörð Bjarmason
2021-10-21 19:57 ` [PATCH 1/6] Makefile: move git-SCRIPT-DEFINES adjacent to $(SCRIPT_DEFINES) Ævar Arnfjörð Bjarmason
2021-10-21 19:57 ` [PATCH 2/6] Makefile: remove $(GIT_VERSION) from $(SCRIPT_DEFINES) Ævar Arnfjörð Bjarmason
2021-10-25 18:57 ` Jeff King
2021-10-21 19:57 ` [PATCH 3/6] Makefile: remove $(NO_CURL) " Ævar Arnfjörð Bjarmason
2021-10-21 19:57 ` Ævar Arnfjörð Bjarmason [this message]
2021-10-21 19:57 ` [PATCH 5/6] git-sh-setup: remove unused sane_egrep() function Ævar Arnfjörð Bjarmason
2021-10-22 0:27 ` Junio C Hamano
2021-10-21 19:58 ` [PATCH 6/6] git-sh-setup: remove "sane_grep", it's not needed anymore Ævar Arnfjörð Bjarmason
2021-10-21 23:17 ` Junio C Hamano
2021-10-22 14:27 ` Johannes Schindelin
2021-10-24 9:08 ` Junio C Hamano
2021-10-25 13:09 ` Johannes Schindelin
2021-10-25 17:14 ` Junio C Hamano
2021-10-25 19:08 ` [PATCH 0/6] Makefile: be less eager to re-build, *.sh code cleanups Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=patch-4.6-4feeeb12aca-20211021T195538Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).