Make git-prune submodule aware (and fix a SEGFAULT in the process)

diff --git a/log-tree.c b/log-tree.c
index 300b73356054ffddb304c2a5cfffae680c0b5dd6..4bef909144b2b5b402ee7cf0d959a0995c00ff0e 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -244,10 +244,10 @@ void show_log(struct rev_info *opt, const char *sep)
                      stdout);
                if (opt->commit_format != CMIT_FMT_ONELINE)
                        fputs("commit ", stdout);
-               if (opt->left_right) {
-                       if (commit->object.flags & BOUNDARY)
-                               putchar('-');
-                       else if (commit->object.flags & SYMMETRIC_LEFT)
+               if (commit->object.flags & BOUNDARY)
+                       putchar('-');
+               else if (opt->left_right) {
+                       if (commit->object.flags & SYMMETRIC_LEFT)
                                putchar('<');
                        else
                                putchar('>');
@@ -267,7 +267,7 @@ void show_log(struct rev_info *opt, const char *sep)
                if (opt->reflog_info) {
                        show_reflog_message(opt->reflog_info,
                                    opt->commit_format == CMIT_FMT_ONELINE,
-                                   opt->relative_date);
+                                   opt->date_mode);
                        if (opt->commit_format == CMIT_FMT_ONELINE) {
                                printf("%s", sep);
                                return;
@@ -280,7 +280,7 @@ void show_log(struct rev_info *opt, const char *sep)
         */
        len = pretty_print_commit(opt->commit_format, commit, ~0u, this_header,
                                  sizeof(this_header), abbrev, subject,
-                                 extra_headers, opt->relative_date);
+                                 extra_headers, opt->date_mode);
 
        if (opt->add_signoff)
                len = append_signoff(this_header, sizeof(this_header), len,