Merge branch 'gl/cleanup' into gl/cleanup-next

diff --git a/log-tree.c b/log-tree.c
index ebb49f29701b2435d66eb92fc2a5c382299e8ee8..031af88933fe1b21de2da701855b9e9604121d3c 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -19,7 +19,7 @@ static int append_signoff(char *buf, int buf_sz, int at, const char *signoff)
        char *cp = buf;
 
        /* Do we have enough space to add it? */
-       if (buf_sz - at <= strlen(signed_off_by) + signoff_len + 2)
+       if (buf_sz - at <= strlen(signed_off_by) + signoff_len + 3)
                return at;
 
        /* First see if we already have the sign-off by the signer */
@@ -34,6 +34,48 @@ static int append_signoff(char *buf, int buf_sz, int at, const char *signoff)
                        return at; /* we already have him */
        }
 
+       /* Does the last line already end with "^[-A-Za-z]+: [^@]+@"?
+        * If not, add a blank line to separate the message from
+        * the run of Signed-off-by: and Acked-by: lines.
+        */
+       {
+               char ch;
+               int seen_colon, seen_at, seen_name, seen_head, not_signoff;
+               seen_colon = 0;
+               seen_at = 0;
+               seen_name = 0;
+               seen_head = 0;
+               not_signoff = 0;
+               cp = buf + at;
+               while (buf <= --cp && (ch = *cp) == '\n')
+                       ;
+               while (!not_signoff && buf <= cp && (ch = *cp--) != '\n') {
+                       if (!seen_at) {
+                               if (ch == '@')
+                                       seen_at = 1;
+                               continue;
+                       }
+                       if (!seen_colon) {
+                               if (ch == '@')
+                                       not_signoff = 1;
+                               else if (ch == ':')
+                                       seen_colon = 1;
+                               else
+                                       seen_name = 1;
+                               continue;
+                       }
+                       if (('A' <= ch && ch <= 'Z') ||
+                           ('a' <= ch && ch <= 'z') ||
+                           ch == '-') {
+                               seen_head = 1;
+                               continue;
+                       }
+                       not_signoff = 1;
+               }
+               if (not_signoff || !seen_head || !seen_name)
+                       buf[at++] = '\n';
+       }
+
        strcpy(buf + at, signed_off_by);
        at += strlen(signed_off_by);
        strcpy(buf + at, signoff);
@@ -43,9 +85,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;
@@ -58,7 +101,7 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
                fputs(diff_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
                if (opt->parents)
                        show_parents(commit, abbrev_commit);
-               putchar('\n');
+               putchar(opt->diffopt.line_termination);
                return;
        }
 
@@ -96,6 +139,11 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
                        subject = "Subject: ";
 
                printf("From %s Mon Sep 17 00:00:00 2001\n", sha1);
+               if (opt->message_id)
+                       printf("Message-Id: <%s>\n", opt->message_id);
+               if (opt->ref_message_id)
+                       printf("In-Reply-To: <%s>\nReferences: <%s>\n",
+                              opt->ref_message_id, opt->ref_message_id);
                if (opt->mime_boundary) {
                        static char subject_buffer[1024];
                        static char buffer[1024];
@@ -128,7 +176,8 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
                        opt->diffopt.stat_sep = buffer;
                }
        } else {
-               printf("%s%s",
+               printf("%s%s%s",
+                      diff_get_color(opt->diffopt.color_diff, DIFF_COMMIT),
                       opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ",
                       diff_unique_abbrev(commit->object.sha1, abbrev_commit));
                if (opt->parents)
@@ -137,6 +186,8 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
                        printf(" (from %s)",
                               diff_unique_abbrev(parent->object.sha1,
                                                  abbrev_commit));
+               printf("%s",
+                      diff_get_color(opt->diffopt.color_diff, DIFF_RESET));
                putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
        }
 
@@ -163,8 +214,22 @@ int log_tree_diff_flush(struct rev_info *opt)
                return 0;
        }
 
-       if (opt->loginfo && !opt->no_commit_id)
-               show_log(opt, opt->loginfo, opt->diffopt.with_stat ? "---\n" : "\n");
+       if (opt->loginfo && !opt->no_commit_id) {
+               /* 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);
        return 1;
 }
@@ -261,7 +326,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;