summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2016-09-29 20:13:05 +0200
committerJunio C Hamano <gitster@pobox.com>2016-09-29 20:44:09 -0700
commit82b83da8d30fb8d1f04f7dd7ac769ceb6ab431c3 (patch)
treeeb448a1c9ab65a9263e8703ebc5cce631a58c34d
parentc99ad274b196bc97f22c1c39178784668cb4623d (diff)
downloadgit-82b83da8d30fb8d1f04f7dd7ac769ceb6ab431c3.tar.gz
pretty: avoid adding reset for %C(auto) if output is emptyrs/c-auto-resets-attributes
We emit an escape sequence for resetting color and attribute for %C(auto) to make sure automatic coloring is displayed as intended. Stop doing that if the output strbuf is empty, i.e. when %C(auto) appears at the start of the format string, because then there is no need for a reset and we save a few bytes in the output. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--pretty.c2
-rwxr-xr-xt/t6006-rev-list-format.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/pretty.c b/pretty.c
index b86c5bb907..bad1bfb225 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1062,7 +1062,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 {
diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index f6020cd2aa..a1dcdb81d7 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[m\\033[33m%s\\033[m\\n" $(git rev-parse HEAD) >expect &&
+ printf "\\033[33m%s\\033[m\\n" $(git rev-parse HEAD) >expect &&
test_cmp expect actual
'