diff options
| -rw-r--r-- | builtin-grep.c | 4 | ||||
| -rw-r--r-- | grep.c | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/builtin-grep.c b/builtin-grep.c index 9343cc5e5d..ff8e51b43e 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -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; } @@ -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; |