Thread (1 message) 1 message, 1 author, 2016-06-15
DORMANTno replies

[PATCH] diff.c: fix a graph output bug

From: <hidden>
Date: 2016-06-15 22:49:06
Subsystem: the rest · Maintainer: Linus Torvalds

Possibly related (same subject, not in this thread)

From: Bo Yang <redacted>

Ouput the line_prefix ahead of color sequence.

Signed-off-by: Bo Yang <redacted>
---
 diff.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index 3aa695d..17873f3 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)
-- 
1.7.0.2.273.gc2413.dirty
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help