зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
e8344e8666
Коммит
e13f38a33e
3
diff.c
3
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)
|
||||
|
|
Загрузка…
Ссылка в новой задаче