diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-03-16 13:16:54 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-03-16 13:16:54 -0700 |
commit | 2df13639e77999efecbe682ae5e72cbfb14b3dcc (patch) | |
tree | 6c1066b80be0275c226525e1aed75cbd7804417a /git-p4.py | |
parent | Merge branch 'cn/deprecate-ssh-git-url' (diff) | |
parent | rebase-i: clarify "is this commit relevant?" test (diff) | |
download | tgif-2df13639e77999efecbe682ae5e72cbfb14b3dcc.tar.xz |
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 'git-p4.py')
0 files changed, 0 insertions, 0 deletions