summaryrefslogtreecommitdiff
path: root/git-sh-setup.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-25 19:45:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-11-25 19:45:07 (GMT)
commitad7ace714d353ef49045bc37c1363e8fc904792d (patch)
tree7cefc4953bac3061de09d5380719f12c6e4fcef3 /git-sh-setup.sh
parentb073b7a990deb1cb3425db45642fa18c8b3cb65c (diff)
parente1622bfcbad680225ad5c337e4778df88389227e (diff)
downloadgit-ad7ace714d353ef49045bc37c1363e8fc904792d.zip
git-ad7ace714d353ef49045bc37c1363e8fc904792d.tar.gz
git-ad7ace714d353ef49045bc37c1363e8fc904792d.tar.bz2
Merge branch 'rs/work-around-grep-opt-insanity'
* rs/work-around-grep-opt-insanity: Protect scripted Porcelains from GREP_OPTIONS insanity mergetool--lib: simplify guess_merge_tool() Conflicts: git-instaweb.sh
Diffstat (limited to 'git-sh-setup.sh')
-rwxr-xr-xgit-sh-setup.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 99cceeb..dfcb807 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -107,6 +107,14 @@ git_editor() {
eval "$GIT_EDITOR" '"$@"'
}
+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
}