summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-26 16:09:15 -0700
committerJunio C Hamano <gitster@pobox.com>2016-09-26 16:09:15 -0700
commitb3e588a48af0ce15832c240887b9a3f9361d22bb (patch)
tree62a76375549a77aa430867df46853f2f18a82270
parent7fcc056dfa3bbab43de6299304a4ce4d32cf7922 (diff)
parentc99ad274b196bc97f22c1c39178784668cb4623d (diff)
downloadgit-b3e588a48af0ce15832c240887b9a3f9361d22bb.tar.gz
Merge branch 'rs/c-auto-resets-attributes'
The pretty-format specifier "%C(auto)" used by the "log" family of commands to enable coloring of the output is taught to also issue a color-reset sequence to the output. * rs/c-auto-resets-attributes: pretty: let %C(auto) reset all attributes
-rw-r--r--pretty.c2
-rwxr-xr-xt/t6006-rev-list-format.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/pretty.c b/pretty.c
index 9788bd8f3f..493edb0a44 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 a1dcdb81d7..f6020cd2aa 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
'