grep: simplify -p output

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>

diff --git a/builtin-grep.c b/builtin-grep.c
index 9343cc5e5dc66e6e47b15d49de71df39a24050bf..ff8e51b43ee7ebf635d72de023dca898c0db9440 100644 (file)
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -285,13 +285,13 @@ static int flush_grep(struct grep_opt *opt,
                argc -= 2;
        }
 
                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)
                /*
                 * 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;
        }
                else
                        opt->show_hunk_mark = 1;
        }

diff --git a/grep.c b/grep.c
index c47785a2f0df79fd5ee8bc77a165fb0be3811091..5d162dae6e43cdfcf6b20627df088a73cbfa98dc 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -491,18 +491,14 @@ static void show_line(struct grep_opt *opt, char *bol, char *eol,
 {
        int rest = eol - bol;
 
 {
        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)
                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
                                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;
 
        }
        opt->last_shown = lno;