From: Bo Yang <struggleyb.nku@gmail.com>
Date: Thu, 8 Jul 2010 15:12:34 +0000 (+0800)
Subject: diff.c: fix a graph output bug
X-Git-Tag: v1.7.2-rc3~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e13f38a33ed181b937c85fd9adf6bce755f69d00?hp=--cc

diff.c: fix a graph output bug

When --graph is in effect, the line-prefix typically has colored graph
line segments and ends with reset.  The color sequence "set" given to
this function is for showing the metainfo part of the patch text and
(1) it should not be applied to the graph lines, and (2) it will be
reset at the end of line_prefix so it won't be in effect anyway.

Signed-off-by: Bo Yang <struggleyb.nku@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

e13f38a33ed181b937c85fd9adf6bce755f69d00
diff --git a/diff.c b/diff.c
index 3aa695df62..17873f3d9e 100644
--- a/diff.c
+++ b/diff.c
@@ -2627,8 +2627,7 @@ static void fill_metainfo(struct strbuf *msg,
 			    (!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
 				abbrev = 40;
 		}
-		strbuf_addf(msg, "%s%sindex %s..", set,
-			    line_prefix,
+		strbuf_addf(msg, "%s%sindex %s..", line_prefix, set,
 			    find_unique_abbrev(one->sha1, abbrev));
 		strbuf_addstr(msg, find_unique_abbrev(two->sha1, abbrev));
 		if (one->mode == two->mode)