Log ref changes made by git-merge and git-pull.

diff --git a/log-tree.c b/log-tree.c
index 7d4c51f954f826d95ed922992e55f655be09b912..9d8d46fa0038202bd49dee9cf5d1a60f781e5d7d 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -43,9 +43,10 @@ static int append_signoff(char *buf, int buf_sz, int at, const char *signoff)
        return at;
 }
 
-void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
+void show_log(struct rev_info *opt, const char *sep)
 {
        static char this_header[16384];
+       struct log_info *log = opt->loginfo;
        struct commit *commit = log->commit, *parent = log->parent;
        int abbrev = opt->diffopt.abbrev;
        int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
@@ -164,10 +165,19 @@ int log_tree_diff_flush(struct rev_info *opt)
        }
 
        if (opt->loginfo && !opt->no_commit_id) {
-               if (opt->diffopt.output_format & DIFF_FORMAT_DIFFSTAT) {
-                       show_log(opt, opt->loginfo,  "---\n");
-               } else {
-                       show_log(opt, opt->loginfo,  "\n");
+               /* When showing a verbose header (i.e. log message),
+                * and not in --pretty=oneline format, we would want
+                * an extra newline between the end of log and the
+                * output for readability.
+                */
+               show_log(opt, opt->diffopt.msg_sep);
+               if (opt->verbose_header &&
+                   opt->commit_format != CMIT_FMT_ONELINE) {
+                       int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
+                       if ((pch & opt->diffopt.output_format) == pch)
+                               printf("---%c", opt->diffopt.line_termination);
+                       else
+                               putchar(opt->diffopt.line_termination);
                }
        }
        diff_flush(&opt->diffopt);
@@ -266,7 +276,7 @@ int log_tree_commit(struct rev_info *opt, struct commit *commit)
        shown = log_tree_diff(opt, commit, &log);
        if (!shown && opt->loginfo && opt->always_show_header) {
                log.parent = NULL;
-               show_log(opt, opt->loginfo, "");
+               show_log(opt, "");
                shown = 1;
        }
        opt->loginfo = NULL;