Protect scripted Porcelains from GREP_OPTIONS insanity

If the user has exported the GREP_OPTIONS environment variable, the output
from "grep" and "egrep" in scripted Porcelains may be different from what
they expect.  For example, we may want to count number of matching lines,
by "grep" piped to "wc -l", and GREP_OPTIONS=-C3 will break such use.

The approach taken by this change to address this issue is to protect only
our own use of grep/egrep.  Because we do not unset it at the beginning of
our scripts, hook scripts run from the scripted Porcelains are exposed to
the same insanity this environment variable causes when grep/egrep is used
to implement logic (e.g. "grep | wc -l"), and it is entirely up to the
hook scripts to protect themselves.

On the other hand, applypatch-msg hook may want to show offending words in
the proposed commit log message using grep to the end user, and the user
might want to set GREP_OPTIONS=--color to paint the match more visibly.
The approach to protect only our own use without unsetting the environment
variable globally will allow this use case.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-am.sh b/git-am.sh
index c132f50da5f3416e6177dd7010e6db3660bdb073..b49f26a49c3af272ef454c5f6e05d0266177a3bd 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -205,7 +205,7 @@ check_patch_format () {
                        # and see if it looks like that they all begin with the
                        # header field names...
                        sed -n -e '/^$/q' -e '/^[       ]/d' -e p "$1" |
                        # and see if it looks like that they all begin with the
                        # header field names...
                        sed -n -e '/^$/q' -e '/^[       ]/d' -e p "$1" |

-                       LC_ALL=C egrep -v '^[!-9;-~]+:' >/dev/null ||
+                       sane_egrep -v '^[!-9;-~]+:' >/dev/null ||

                        patch_format=mbox
                fi
        } < "$1" || clean_abort
                        patch_format=mbox
                fi
        } < "$1" || clean_abort


@@ -554,7 +554,7 @@ do
                        stop_here $this
 
                # skip pine's internal folder data
                        stop_here $this
 
                # skip pine's internal folder data

-               grep '^Author: Mail System Internal Data$' \
+               sane_grep '^Author: Mail System Internal Data$' \

                        <"$dotest"/info >/dev/null &&
                        go_next && continue
 
                        <"$dotest"/info >/dev/null &&
                        go_next && continue
 

diff --git a/git-bisect.sh b/git-bisect.sh
index 6f6f03966f5905c799a1a67df58e11b0a5f7564c..0c422d5fb501418a6c761710aff9c47c8968eb36 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -393,7 +393,7 @@ bisect_run () {
 
       cat "$GIT_DIR/BISECT_RUN"
 
 
       cat "$GIT_DIR/BISECT_RUN"
 

-      if grep "first bad commit could be any of" "$GIT_DIR/BISECT_RUN" \
+      if sane_grep "first bad commit could be any of" "$GIT_DIR/BISECT_RUN" \

                > /dev/null; then
          echo >&2 "bisect run cannot continue any more"
          exit $res
                > /dev/null; then
          echo >&2 "bisect run cannot continue any more"
          exit $res


@@ -405,7 +405,7 @@ bisect_run () {
          exit $res
       fi
 
          exit $res
       fi
 

-      if grep "is the first bad commit" "$GIT_DIR/BISECT_RUN" > /dev/null; then
+      if sane_grep "is the first bad commit" "$GIT_DIR/BISECT_RUN" > /dev/null; then

          echo "bisect run success"
          exit 0;
       fi
          echo "bisect run success"
          exit 0;
       fi

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index a480d6fc70a4ca738c8ead14052afc3c1f5e8b02..8ef1bde710c5fc6c3debd19440d423424046fd95 100755 (executable)
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -457,7 +457,7 @@ if [ "$filter_tag_name" ]; then
                                git mktag) ||
                                die "Could not create new tag object for $ref"
                        if git cat-file tag "$ref" | \
                                git mktag) ||
                                die "Could not create new tag object for $ref"
                        if git cat-file tag "$ref" | \

-                          grep '^-----BEGIN PGP SIGNATURE-----' >/dev/null 2>&1
+                          sane_grep '^-----BEGIN PGP SIGNATURE-----' >/dev/null 2>&1

                        then
                                warn "gpg signature stripped from tag object $sha1t"
                        fi
                        then
                                warn "gpg signature stripped from tag object $sha1t"
                        fi

diff --git a/git-instaweb.sh b/git-instaweb.sh
index d96eddbe56783d61304941a134361797c82480e7..84805c61e584f7cd01145805c43944b5ba8b8311 100755 (executable)
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -41,7 +41,7 @@ resolve_full_httpd () {
        case "$httpd" in
        *apache2*|*lighttpd*)
                # ensure that the apache2/lighttpd command ends with "-f"
        case "$httpd" in
        *apache2*|*lighttpd*)
                # ensure that the apache2/lighttpd command ends with "-f"

-               if ! echo "$httpd" | grep -- '-f *$' >/dev/null 2>&1
+               if ! echo "$httpd" | sane_grep -- '-f *$' >/dev/null 2>&1

                then
                        httpd="$httpd -f"
                fi
                then
                        httpd="$httpd -f"
                fi


@@ -297,8 +297,8 @@ EOF
 
        # check to see if Dennis Stosberg's mod_perl compatibility patch
        # (<20060621130708.Gcbc6e5c@leonov.stosberg.net>) has been applied
 
        # 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 'MOD_PERL' \
-                               "$GIT_DIR/gitweb/gitweb.cgi" >/dev/null
+       if test -f "$module_path/mod_perl.so" &&
+          sane_grep 'MOD_PERL' "$GIT_DIR/gitweb/gitweb.cgi" >/dev/null

        then
                # favor mod_perl if available
                cat >> "$conf" <<EOF
        then
                # favor mod_perl if available
                cat >> "$conf" <<EOF


@@ -316,7 +316,7 @@ EOF
                # plain-old CGI
                resolve_full_httpd
                list_mods=$(echo "$full_httpd" | sed "s/-f$/-l/")
                # plain-old CGI
                resolve_full_httpd
                list_mods=$(echo "$full_httpd" | sed "s/-f$/-l/")

-               $list_mods | grep 'mod_cgi\.c' >/dev/null 2>&1 || \
+               $list_mods | sane_grep 'mod_cgi\.c' >/dev/null 2>&1 || \

                echo "LoadModule cgi_module $module_path/mod_cgi.so" >> "$conf"
                cat >> "$conf" <<EOF
 AddHandler cgi-script .cgi
                echo "LoadModule cgi_module $module_path/mod_cgi.so" >> "$conf"
                cat >> "$conf" <<EOF
 AddHandler cgi-script .cgi

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 23ded48322bf795b06aa40e4684bc710c8232549..6268e76bd922af99088c3ed840876f0ea186df55 100755 (executable)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -106,8 +106,8 @@ mark_action_done () {
        sed -e 1q < "$TODO" >> "$DONE"
        sed -e 1d < "$TODO" >> "$TODO".new
        mv -f "$TODO".new "$TODO"
        sed -e 1q < "$TODO" >> "$DONE"
        sed -e 1d < "$TODO" >> "$TODO".new
        mv -f "$TODO".new "$TODO"

-       count=$(grep -c '^[^#]' < "$DONE")
-       total=$(($count+$(grep -c '^[^#]' < "$TODO")))
+       count=$(sane_grep -c '^[^#]' < "$DONE")
+       total=$(($count+$(sane_grep -c '^[^#]' < "$TODO")))

        if test "$last_count" != "$count"
        then
                last_count=$count
        if test "$last_count" != "$count"
        then
                last_count=$count


@@ -147,7 +147,7 @@ die_abort () {
 }
 
 has_action () {
 }
 
 has_action () {

-       grep '^[^#]' "$1" >/dev/null
+       sane_grep '^[^#]' "$1" >/dev/null

 }
 
 pick_one () {
 }
 
 pick_one () {


@@ -731,7 +731,7 @@ first and then run 'git rebase --continue' again."
                        git rev-list $REVISIONS |
                        while read rev
                        do
                        git rev-list $REVISIONS |
                        while read rev
                        do

-                               if test -f "$REWRITTEN"/$rev -a "$(grep "$rev" "$DOTEST"/not-cherry-picks)" = ""
+                               if test -f "$REWRITTEN"/$rev -a "$(sane_grep "$rev" "$DOTEST"/not-cherry-picks)" = ""

                                then
                                        # Use -f2 because if rev-list is telling us this commit is
                                        # not worthwhile, we don't want to track its multiple heads,
                                then
                                        # Use -f2 because if rev-list is telling us this commit is
                                        # not worthwhile, we don't want to track its multiple heads,


@@ -739,7 +739,7 @@ first and then run 'git rebase --continue' again."
                                        # be rebasing on top of it
                                        git rev-list --parents -1 $rev | cut -d' ' -s -f2 > "$DROPPED"/$rev
                                        short=$(git rev-list -1 --abbrev-commit --abbrev=7 $rev)
                                        # be rebasing on top of it
                                        git rev-list --parents -1 $rev | cut -d' ' -s -f2 > "$DROPPED"/$rev
                                        short=$(git rev-list -1 --abbrev-commit --abbrev=7 $rev)

-                                       grep -v "^[a-z][a-z]* $short" <"$TODO" > "${TODO}2" ; mv "${TODO}2" "$TODO"
+                                       sane_grep -v "^[a-z][a-z]* $short" <"$TODO" > "${TODO}2" ; mv "${TODO}2" "$TODO"

                                        rm "$REWRITTEN"/$rev
                                fi
                        done
                                        rm "$REWRITTEN"/$rev
                                fi
                        done

diff --git a/git-rebase.sh b/git-rebase.sh
index 6ec155cf03c98f2e075f298039037d0e099311b1..0ec435558f8ad59e96766cd3f34cbb541f2dbaed 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -467,7 +467,7 @@ orig_head=$branch
 mb=$(git merge-base "$onto" "$branch")
 if test "$upstream" = "$onto" && test "$mb" = "$onto" &&
        # linear history?
 mb=$(git merge-base "$onto" "$branch")
 if test "$upstream" = "$onto" && test "$mb" = "$onto" &&
        # linear history?

-       ! (git rev-list --parents "$onto".."$branch" | grep " .* ") > /dev/null
+       ! (git rev-list --parents "$onto".."$branch" | sane_grep " .* ") > /dev/null

 then
        if test -z "$force_rebase"
        then
 then
        if test -z "$force_rebase"
        then

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index c41c2f7439724adc3dd13b92c86b25d254fc23b8..aa07cc3d188df9744d50d8e0487c86a2cb30b1ac 100755 (executable)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -114,6 +114,14 @@ git_editor() {
        eval "${GIT_EDITOR:=vi}" '"$@"'
 }
 
        eval "${GIT_EDITOR:=vi}" '"$@"'
 }
 

+sane_grep () {
+       GREP_OPTIONS= LC_ALL=C grep "$@"
+}
+
+sane_egrep () {
+       GREP_OPTIONS= LC_ALL=C egrep "$@"
+}
+

 is_bare_repository () {
        git rev-parse --is-bare-repository
 }
 is_bare_repository () {
        git rev-parse --is-bare-repository
 }

diff --git a/git-submodule.sh b/git-submodule.sh
index 0462e529d934750fb63a5a897f135d60ac674b5e..b7ccd12d722469d353896fa85c7af6e0cf77afc8 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -57,7 +57,7 @@ resolve_relative_url ()
 #
 module_list()
 {
 #
 module_list()
 {

-       git ls-files --error-unmatch --stage -- "$@" | grep '^160000 '
+       git ls-files --error-unmatch --stage -- "$@" | sane_grep '^160000 '

 }
 
 #
 }
 
 #


@@ -567,7 +567,7 @@ cmd_summary() {
        cd_to_toplevel
        # Get modified modules cared by user
        modules=$(git $diff_cmd $cached --raw $head -- "$@" |
        cd_to_toplevel
        # Get modified modules cared by user
        modules=$(git $diff_cmd $cached --raw $head -- "$@" |

-               egrep '^:([0-7]* )?160000' |
+               sane_egrep '^:([0-7]* )?160000' |

                while read mod_src mod_dst sha1_src sha1_dst status name
                do
                        # Always show modules deleted or type-changed (blob<->module)
                while read mod_src mod_dst sha1_src sha1_dst status name
                do
                        # Always show modules deleted or type-changed (blob<->module)


@@ -581,7 +581,7 @@ cmd_summary() {
        test -z "$modules" && return
 
        git $diff_cmd $cached --raw $head -- $modules |
        test -z "$modules" && return
 
        git $diff_cmd $cached --raw $head -- $modules |

-       egrep '^:([0-7]* )?160000' |
+       sane_egrep '^:([0-7]* )?160000' |

        cut -c2- |
        while read mod_src mod_dst sha1_src sha1_dst status name
        do
        cut -c2- |
        while read mod_src mod_dst sha1_src sha1_dst status name
        do