diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-06 14:53:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-06 14:53:12 -0700 |
| commit | 578e6021c0819d7be1179e05e7ce0e6fdb2a01b7 (patch) | |
| tree | a888a1c8322c16f3218d6267c2395af75f1f32d0 /pretty.c | |
| parent | fbfe878f9777d4d52e1eaef1fca5170b9efee99a (diff) | |
| parent | 82b83da8d30fb8d1f04f7dd7ac769ceb6ab431c3 (diff) | |
| download | git-578e6021c0819d7be1179e05e7ce0e6fdb2a01b7.tar.gz | |
Merge branch 'rs/c-auto-resets-attributes'
When "%C(auto)" appears at the very beginning of the pretty format
string, it did not need to issue the reset sequence, but it did.
* rs/c-auto-resets-attributes:
pretty: avoid adding reset for %C(auto) if output is empty
Diffstat (limited to 'pretty.c')
| -rw-r--r-- | pretty.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1072,7 +1072,7 @@ 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) + if (c->auto_color && sb->len) strbuf_addstr(sb, GIT_COLOR_RESET); return 7; /* consumed 7 bytes, "C(auto)" */ } else { |