Re: [PATCH 3/7] grep: --count over binary
Am 14.05.2010 11:34, schrieb Dmitry Potapov:
Show 11 quoted lines
> On Thu, May 13, 2010 at 10:37:10PM +0200, René Scharfe wrote:
>> The intent of showing the message "Binary file xyz matches" for
>> binary files is to avoid annoying users by potentially messing up
>> their terminals by printing control characters. In --count mode,
>> this precaution isn't necessary.
>>
>> Display counts of matches if -c/--count was specified, even if -a
>> was not given. GNU grep does the same.
>
> It is also not necessary with '-l' and '-L' options. (At least, if
> we follow GNU grep).
Good point. The same is true for -q, too. ->unmatch_name_only (-L) and ->status_only (-q) are already handled correctly because they are checked before binary_match_only. We can do the same for ->name_only.
-- >8 --
Subject: grep: --name-only over binary
As with the option -c/--count, git grep with the option -l/--name-only should work the same with binary files as with text files because there is no danger of messing up the terminal with control characters from the contents of matching files. GNU grep does the same.
Move the check for ->name_only before the one for binary_match_only, thus making the latter irrelevant for git grep -l. Also add a simple test for each of -l, -L and -q. The latter two options were already handled before binary_match_only, so no code changes were needed to make them pass.
Reported-by: Dmitry Potapov <dpotapov@gmail.com>
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
---
grep.c | 8 ++++----
t/t7008-grep-binary.sh | 18 ++++++++++++++++++
2 files changed, 22 insertions(+), 4 deletions(-)
Show changes to 2 files +22 −4
grep.c, t/t7008-grep-binary.sh
diff --git a/grep.c b/grep.c
index 2b2f70e..f292e25 100644
--- a/grep.c
+++ b/grep.c
@@ -885,6 +885,10 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
count++;
if (opt->status_only)
return 1;
+ if (opt->name_only) {
+ show_name(opt, name);
+ return 1;
+ }
if (binary_match_only) {
opt->output(opt, "Binary file ", 12);
output_color(opt, name, strlen(name),
@@ -892,10 +896,6 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
opt->output(opt, " matches\n", 9);
return 1;
}
- if (opt->name_only) {
- show_name(opt, name);
- return 1;
- }
/* Hit at this line. If we haven't shown the
* pre-context lines, we would need to show them.
* When asked to do "count", this still show
diff --git a/t/t7008-grep-binary.sh b/t/t7008-grep-binary.sh
index d8fde18..4f5e74f 100755
--- a/t/t7008-grep-binary.sh
+++ b/t/t7008-grep-binary.sh
@@ -33,6 +33,24 @@ test_expect_success 'git grep -c ina a' '
test_cmp expect actual
'
+test_expect_success 'git grep -l ina a' '
+ echo a >expect &&
+ git grep -l ina a >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'git grep -L bar a' '
+ echo a >expect &&
+ git grep -L bar a >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'git grep -q ina a' '
+ : >expect &&
+ git grep -q ina a >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'git grep -F ile a' '
git grep -F ile a
'
--
1.7.1
René Scharfe