Merge branch 'as/test-name-alias-uniquely'

diff --git a/log-tree.c b/log-tree.c
index 4f86defe324bac8374585df5d9e8ef7b5f9a3524..8876c736d4afbb92d862598861145abe0f408cec 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -671,6 +671,7 @@ void show_log(struct rev_info *opt)
        ctx.preserve_subject = opt->preserve_subject;
        ctx.reflog_info = opt->reflog_info;
        ctx.fmt = opt->commit_format;
+       ctx.color = opt->diffopt.use_color;
        pretty_print_commit(&ctx, commit, &msgbuf);
 
        if (opt->add_signoff)