Merge branch 'lc/shell-default-value-noexpand'

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index c918ed779b8436976ee6c0a2a7489fc5d4ecc20f..85db5f1c63c3c6fa0fff95a747538e47f02ec46d 100644 (file)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -168,11 +168,11 @@ git_pager() {
 }
 
 sane_grep () {
-       GREP_OPTIONS= LC_ALL=C grep "$@"
+       GREP_OPTIONS= LC_ALL=C grep @@SANE_TEXT_GREP@@ "$@"
 }
 
 sane_egrep () {
-       GREP_OPTIONS= LC_ALL=C egrep "$@"
+       GREP_OPTIONS= LC_ALL=C egrep @@SANE_TEXT_GREP@@ "$@"
 }
 
 is_bare_repository () {