summaryrefslogtreecommitdiff
path: root/grep.c
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2009-07-01 22:06:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-07-03 04:36:42 (GMT)
commited24e401e0e6ab860475b8575e28a2c6ea99cc69 (patch)
treedf82144f4047a998ca8d5a97e79778c6616deb75 /grep.c
parent60ecac98ed6f420c6bf823491074219087c749d4 (diff)
downloadgit-ed24e401e0e6ab860475b8575e28a2c6ea99cc69.zip
git-ed24e401e0e6ab860475b8575e28a2c6ea99cc69.tar.gz
git-ed24e401e0e6ab860475b8575e28a2c6ea99cc69.tar.bz2
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>
Diffstat (limited to 'grep.c')
-rw-r--r--grep.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/grep.c b/grep.c
index c47785a..5d162da 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;