diff options
| author | René Scharfe <l.s.r@web.de> | 2014-03-11 22:15:49 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-11 15:05:28 -0700 |
| commit | f76d947ae13ca66790a305a58764ae50ea7442d9 (patch) | |
| tree | 05dacbd22bc11c585b0b6dbe058af4283c3fdf05 | |
| parent | 9afad7a1e6363ed249a5cfcc95a35900ae4970cb (diff) | |
| download | git-rs/grep-h-c.tar.gz | |
grep: support -h (no header) with --countrs/grep-h-c
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>
| -rw-r--r-- | grep.c | 7 | ||||
| -rwxr-xr-x | t/t7810-grep.sh | 12 |
2 files changed, 17 insertions, 2 deletions
@@ -1562,8 +1562,11 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle */ if (opt->count && count) { char buf[32]; - output_color(opt, gs->name, strlen(gs->name), opt->color_filename); - output_sep(opt, ':'); + if (opt->pathname) { + output_color(opt, gs->name, strlen(gs->name), + opt->color_filename); + output_sep(opt, ':'); + } snprintf(buf, sizeof(buf), "%u\n", count); opt->output(opt, buf, strlen(buf)); return 1; diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index 46aaebc475..63b3039243 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -328,6 +328,18 @@ do grep "a+b*c" $H ab >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 cat >expected <<EOF |