diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-08 23:47:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-10 23:35:43 (GMT) |
| commit | 71b401032b9e5b0a71e41d95ae0998858787700c (patch) | |
| tree | f69cf92990eb06865b3bac4d9690a4d80c1e16f0 /configure.ac | |
| parent | 833e48259e23aea76f3765d28d1b2200332301f7 (diff) | |
| download | git-71b401032b9e5b0a71e41d95ae0998858787700c.zip git-71b401032b9e5b0a71e41d95ae0998858787700c.tar.gz git-71b401032b9e5b0a71e41d95ae0998858787700c.tar.bz2 | |
sane_grep: pass "-a" if grep accepts it
Newer versions of GNU grep is reported to be pickier when we feed a
non-ASCII input and break some Porcelain scripts. As we know we do
not feed random binary file to our own sane_grep wrapper, allow us
to always pass "-a" by setting SANE_TEXT_GREP=-a Makefile variable
to work it around.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 1f55009..6fd7b8e 100644 --- a/configure.ac +++ b/configure.ac @@ -471,6 +471,13 @@ if test -n "$ASCIIDOC"; then esac fi +if grep -a ascii configure.ac >/dev/null; then + AC_MSG_RESULT([Using 'grep -a' for sane_grep]) + SANE_TEXT_GREP=-a +else + SANE_TEXT_GREP= +fi +GIT_CONF_SUBST([SANE_TEXT_GREP]) ## Checks for libraries. AC_MSG_NOTICE([CHECKS for libraries]) |