Am 17.09.2016 um 14:51 schrieb Anatoly Borodin: > Hi All! > > First bug: > > git log -3 --pretty='%C(cyan)%C(auto)%h%C(auto)%d %s' > > prints %h with the default color (normal yellow), but > > git log -3 --pretty='%C(bold cyan)%C(auto)%h%C(auto)%d %s' > > shows %h with bold yellow, as if only the color was reset, but not > the attributes (blink, ul, reverse also work this way). %d and %s are > printed with the right color both times. > > Second bug, maybe related to the first one: > > git log -3 --pretty='%C(bold cyan)%h%C(auto)%d %s %an %h %h %s' > > The first line looks as expected. Well, almost: the '(' of %d is bold > yellow. > > The second line looks like this: > > * %h, %s, %an with bold cyan; > * %h with bold yellow; > * %h with normal yellow and %s with normal white (default colors). > > PS git version 2.9.2
Well, in both cases you could add %Creset before %C(auto) to get what you want. I'm not sure how just how automatic %C(auto) is supposed to be, but you expected it do emit the reset for you, right? Sounds reasonable to me. The following patch implements that behavior. Duy, what do you think? -- >8 -- Subject: pretty: let %C(auto) reset all attributes Reset colors and attributes upon %C(auto) to enable full automatic control over them; otherwise attributes like bold or reverse could still be in effect from previous %C placeholders. Signed-off-by: Rene Scharfe <l....@web.de> --- pretty.c | 2 ++ t/t6006-rev-list-format.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pretty.c b/pretty.c index 9788bd8..493edb0 100644 --- a/pretty.c +++ b/pretty.c @@ -1072,6 +1072,8 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */ case 'C': if (starts_with(placeholder + 1, "(auto)")) { c->auto_color = want_color(c->pretty_ctx->color); + if (c->auto_color) + strbuf_addstr(sb, GIT_COLOR_RESET); return 7; /* consumed 7 bytes, "C(auto)" */ } else { int ret = parse_color(sb, placeholder, c); diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index a1dcdb8..f6020cd 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh @@ -225,7 +225,7 @@ test_expect_success '%C(auto,...) respects --color=auto (stdout not tty)' ' test_expect_success '%C(auto) respects --color' ' git log --color --format="%C(auto)%H" -1 >actual && - printf "\\033[33m%s\\033[m\\n" $(git rev-parse HEAD) >expect && + printf "\\033[m\\033[33m%s\\033[m\\n" $(git rev-parse HEAD) >expect && test_cmp expect actual ' -- 2.10.0