grep: simplify -p output

René Scharfe · gitster · commit ed24e401e0e6 · 2009-07-02T21:36:42.000-07:00
It was found a bit too loud to show == separators between the function
headers.

Signed-off-by: Rene Scharfe &lt;rene.scharfe@lsrfire.ath.cx&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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;
 	}
diff --git 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;
 
-	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;
 
