From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Mar 2016 20:16:54 +0000 (-0700)
Subject: Merge branch 'jc/sane-grep'
X-Git-Tag: v2.8.0-rc3~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2df13639e77999efecbe682ae5e72cbfb14b3dcc;p=thirdparty%2Fgit.git

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
---

2df13639e77999efecbe682ae5e72cbfb14b3dcc