diff options
| author |  Bo Yang <struggleyb.nku@gmail.com> | 2010-07-08 23:12:34 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-07-08 18:09:14 -0700 |
| commit | e13f38a33ed181b937c85fd9adf6bce755f69d00 (patch) | |
| tree | 92a46f98814ad15aaf8aa1e0b6f23c35bb8f637f | |
| parent | tests: Use skip_all=* to skip tests (diff) | |
| download | tgif-e13f38a33ed181b937c85fd9adf6bce755f69d00.tar.xz | |
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>
| -rw-r--r-- | diff.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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) |