log.decorate: only ignore it under "log --pretty=raw"

diff --git a/builtin-log.c b/builtin-log.c
index 7f4186f19e241ce28ae57f49f3b64da731fab74a..017fcf82ce3705335e5548b193e4d590e4949c62 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -108,10 +108,11 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
        }
 
        /*
-        * defeat log.decorate configuration interacting with --pretty
+        * defeat log.decorate configuration interacting with --pretty=raw
         * from the command line.
         */
-       if (!decoration_given && rev->pretty_given)
+       if (!decoration_given && rev->pretty_given
+           && rev->commit_format == CMIT_FMT_RAW)
                decoration_style = 0;
 
        if (decoration_style) {