Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maint

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 4691fbcb64fe7ecbc58930bb96d4e6b28e2b87a7..c48139a49420ea2318e23d8667eb20bae9772463 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 () {