From: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Date: Wed, 1 Jul 2009 22:06:34 +0000 (+0200)
Subject: grep: simplify -p output
X-Git-Tag: v1.6.4-rc0~4^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ed24e401e0e6ab860475b8575e28a2c6ea99cc69;p=git.git

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 9343cc5e5..ff8e51b43 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;
 	}
diff --git a/grep.c b/grep.c
index c47785a2f..5d162dae6 100644
--- 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;