summaryrefslogtreecommitdiff
path: root/config.mak.uname
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-03-16 13:16:54 -0700
committerJunio C Hamano <gitster@pobox.com>2016-03-16 13:16:54 -0700
commit2df13639e77999efecbe682ae5e72cbfb14b3dcc (patch)
tree6c1066b80be0275c226525e1aed75cbd7804417a /config.mak.uname
parent9e689802e393b614ab9343dba2cee3828950f3ec (diff)
parent214123c6457d9706716dbdd608d03262e348a121 (diff)
downloadgit-2df13639e77999efecbe682ae5e72cbfb14b3dcc.tar.gz
Merge branch 'jc/sane-grep'
Recent versions of GNU grep is pickier than before to decide if a file is "binary" and refuse to give line-oriented hits when we expect it to, unless explicitly told with "-a" option. As our scripted Porcelains use sane_grep wrapper for line-oriented data, even when the line may contain non-ASCII payload we took from end-user data, use "grep -a" to implement sane_grep wrapper when using an implementation of "grep" that takes the "-a" option. * jc/sane-grep: rebase-i: clarify "is this commit relevant?" test sane_grep: pass "-a" if grep accepts it
Diffstat (limited to 'config.mak.uname')
-rw-r--r--config.mak.uname1
1 files changed, 1 insertions, 0 deletions
diff --git a/config.mak.uname b/config.mak.uname
index 4c68e078e7..1139b44007 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -37,6 +37,7 @@ ifeq ($(uname_S),Linux)
HAVE_CLOCK_GETTIME = YesPlease
HAVE_CLOCK_MONOTONIC = YesPlease
HAVE_GETDELIM = YesPlease
+ SANE_TEXT_GREP=-a
endif
ifeq ($(uname_S),GNU/kFreeBSD)
HAVE_ALLOCA_H = YesPlease