Merge branch 'jc/tartree' into jc/builtin-n-tar-tree

diff --git a/log-tree.c b/log-tree.c
index 9e5416427a38359078ab35902bad2e7cffac2a0b..b90ba6762ad0aa469a19c42cf8d53f7a79db02d5 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -3,23 +3,45 @@
 #include "commit.h"
 #include "log-tree.h"
 
+static void show_parents(struct commit *commit, int abbrev)
+{
+       struct commit_list *p;
+       for (p = commit->parents; p ; p = p->next) {
+               struct commit *parent = p->item;
+               printf(" %s", diff_unique_abbrev(parent->object.sha1, abbrev));
+       }
+}
+
 void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
 {
        static char this_header[16384];
        struct commit *commit = log->commit, *parent = log->parent;
        int abbrev = opt->diffopt.abbrev;
        int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
+       const char *extra;
        int len;
 
        opt->loginfo = NULL;
        if (!opt->verbose_header) {
-               puts(sha1_to_hex(commit->object.sha1));
+               fputs(diff_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
+               if (opt->parents)
+                       show_parents(commit, abbrev_commit);
+               putchar('\n');
                return;
        }
 
        /*
-        * Whitespace between commit messages, unless we are oneline
+        * The "oneline" format has several special cases:
+        *  - The pretty-printed commit lacks a newline at the end
+        *    of the buffer, but we do want to make sure that we
+        *    have a newline there. If the separator isn't already
+        *    a newline, add an extra one.
+        *  - unlike other log messages, the one-line format does
+        *    not have an empty line between entries.
         */
+       extra = "";
+       if (*sep != '\n' && opt->commit_format == CMIT_FMT_ONELINE)
+               extra = "\n";
        if (opt->shown_one && opt->commit_format != CMIT_FMT_ONELINE)
                putchar('\n');
        opt->shown_one = 1;
@@ -30,7 +52,9 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
        printf("%s%s",
                opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ",
                diff_unique_abbrev(commit->object.sha1, abbrev_commit));
-       if (parent) 
+       if (opt->parents)
+               show_parents(commit, abbrev_commit);
+       if (parent)
                printf(" (from %s)", diff_unique_abbrev(parent->object.sha1, abbrev_commit));
        putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
 
@@ -38,7 +62,7 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
         * And then the pretty-printed message itself
         */
        len = pretty_print_commit(opt->commit_format, commit, ~0u, this_header, sizeof(this_header), abbrev);
-       printf("%s%s", this_header, sep);
+       printf("%s%s%s", this_header, extra, sep);
 }
 
 int log_tree_diff_flush(struct rev_info *opt)