test-ref-store: remove force-create argument for create-reflog

[thirdparty/git.git] / git-instaweb.sh

diff --git a/git-instaweb.sh b/git-instaweb.sh
index 7c55229773e2bdb0f138b1180ab22d05c74ff904..4349566c89163ea21dfb8388f494cdcdf86604c9 100755 (executable)
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -49,7 +49,7 @@ resolve_full_httpd () {
        *apache2*|*lighttpd*|*httpd*)
                # yes, *httpd* covers *lighttpd* above, but it is there for clarity
                # ensure that the apache2/lighttpd command ends with "-f"
-               if ! echo "$httpd" | sane_grep -- '-f *$' >/dev/null 2>&1
+               if ! echo "$httpd" | grep -- '-f *$' >/dev/null 2>&1
                then
                        httpd="$httpd -f"
                fi
@@ -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
@@ -402,7 +399,7 @@ EOF
                # plain-old CGI
                resolve_full_httpd
                list_mods=$(echo "$full_httpd" | sed 's/-f$/-l/')
-               $list_mods | sane_grep 'mod_cgi\.c' >/dev/null 2>&1 || \
+               $list_mods | grep 'mod_cgi\.c' >/dev/null 2>&1 || \
                if test -f "$module_path/mod_cgi.so"
                then
                        echo "LoadModule cgi_module $module_path/mod_cgi.so" >> "$conf"