undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grep: support -h (no header) with --count

Browse Source 
Suppress printing the header (filename) with -h even if in -c/--count
mode.  GNU grep and OpenBSD's grep do the same.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2014-03-11 22:15:49 +01:00 committed by Junio C Hamano
parent 9afad7a1e6
commit f76d947ae1
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
grep.c
View File

@ -1562,8 +1562,11 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
*/ */
if (opt->count && count) { if (opt->count && count) {
char buf[32]; char buf[32];
output_color(opt, gs->name, strlen(gs->name), opt->color_filename); if (opt->pathname) {
output_sep(opt, ':'); output_color(opt, gs->name, strlen(gs->name),
opt->color_filename);
output_sep(opt, ':');
}
snprintf(buf, sizeof(buf), "%u\n", count); snprintf(buf, sizeof(buf), "%u\n", count);
opt->output(opt, buf, strlen(buf)); opt->output(opt, buf, strlen(buf));
return 1; return 1;

12
t/t7810-grep.sh
View File

@ -328,6 +328,18 @@ do
grep "a+b*c" $H ab >actual && grep "a+b*c" $H ab >actual &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success "grep --count $L" '
echo ${HC}ab:3 >expected &&
git grep --count -e b $H -- ab >actual &&
test_cmp expected actual
'
test_expect_success "grep --count -h $L" '
echo 3 >expected &&
git grep --count -h -e b $H -- ab >actual &&
test_cmp expected actual
'
done done
cat >expected <<EOF cat >expected <<EOF