t/t5515-fetch-merge-logic.sh: Added tests for the merge login in git-fetch

diff --git a/log-tree.c b/log-tree.c
index ac8619404797633436258dbf9d76f9f4aa323395..6ce239d8f92837ccce7326dab1951f74360eef88 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -211,7 +211,7 @@ void show_log(struct rev_info *opt, const char *sep)
                                 sha1, sha1);
                        opt->diffopt.stat_sep = buffer;
                }
-       } else {
+       } else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
                fputs(diff_get_color(opt->diffopt.color_diff, DIFF_COMMIT),
                      stdout);
                if (opt->commit_format != CMIT_FMT_ONELINE)