Re: [PATCH] diff.c: fix a graph output bug
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:49:06
struggleyb.nku@gmail.com writes:
From: Bo Yang <redacted> Ouput the line_prefix ahead of color sequence.
Justification for the patch, and/or a better bug description ("when run
with this combination of options, X gets painted in that color that is not
meant to be used for X") please?
quoted hunk
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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html