Merge branch 'ap/git-svn-propset-doc'

diff --git a/pretty.c b/pretty.c
index 87c44971a1d2070e4d256818e96fccc29472ec4a..c3ec430220a5667685dbdeca5252df48bd65cd41 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -1063,7 +1063,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
        switch (placeholder[0]) {
        case 'C':
                if (starts_with(placeholder + 1, "(auto)")) {
-                       c->auto_color = 1;
+                       c->auto_color = want_color(c->pretty_ctx->color);
                        return 7; /* consumed 7 bytes, "C(auto)" */
                } else {
                        int ret = parse_color(sb, placeholder, c);