From: Jeff King Date: Wed, 09 Mar 2016 00:10:43 GMT Subject: Re: [PATCH] rebase -p: avoid grep on potentailly non-ASCII data Message-ID: <20160309001042.GA32669@sigill.intra.peff.net> In-Reply-To: On Tue, Mar 08, 2016 at 03:20:26PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > I actually wonder if we should have a build-time knob to put "grep -a" > > into sane_grep(). We do not ever plan to feed it binary data, so that > > will do what, provided the system grep handles "-a". And on those that > > do not know about "-a", one imagines that they do not suffer from this > > problem in the first place (which is really limited to recent versions > > of GNU grep). > > Something along this line, you mean? I'll leave it as a > low-hanging-fruit to add autoconf support ;-) Yeah, though I think I would probably squash in: diff --git a/config.mak.uname b/config.mak.uname index 723f632..15557c3 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 It's not necessary on all Linux platforms yet, but it doesn't hurt, so we can err on the side of including it (and I think we can assume all Linux systems have GNU grep or equivalent). -Peff