Skip to content

Commit

Permalink
grep: simplify -p output
Browse files Browse the repository at this point in the history
It was found a bit too loud to show == separators between the function
headers.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
René Scharfe authored and Junio C Hamano committed Jul 3, 2009
1 parent 60ecac9 commit ed24e40
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
4 changes: 2 additions & 2 deletions builtin-grep.c
Original file line number Diff line number Diff line change
Expand Up @@ -285,13 +285,13 @@ static int flush_grep(struct grep_opt *opt,
argc -= 2;
}

if (opt->pre_context || opt->post_context || opt->funcname) {
if (opt->pre_context || opt->post_context) {
/*
* grep handles hunk marks between files, but we need to
* do that ourselves between multiple calls.
*/
if (opt->show_hunk_mark)
write_or_die(1, opt->funcname ? "==\n" : "--\n", 3);
write_or_die(1, "--\n", 3);
else
opt->show_hunk_mark = 1;
}
Expand Down
12 changes: 4 additions & 8 deletions grep.c
Original file line number Diff line number Diff line change
Expand Up @@ -491,18 +491,14 @@ static void show_line(struct grep_opt *opt, char *bol, char *eol,
{
int rest = eol - bol;

if (opt->pre_context || opt->post_context || opt->funcname) {
if (opt->pre_context || opt->post_context) {
if (opt->last_shown == 0) {
if (opt->show_hunk_mark)
fputs(opt->funcname ? "==\n" : "--\n", stdout);
fputs("--\n", stdout);
else
opt->show_hunk_mark = 1;
} else if (lno > opt->last_shown + 1) {
if (opt->pre_context || opt->post_context)
fputs((sign == '=') ? "==\n" : "--\n", stdout);
else if (sign == '=')
fputs("==\n", stdout);
}
} else if (lno > opt->last_shown + 1)
fputs("--\n", stdout);
}
opt->last_shown = lno;

Expand Down

0 comments on commit ed24e40

Please sign in to comment.