Merge branch 'maint'

diff --git a/submodule.c b/submodule.c
index d5fce7a882e14f6154d56f38531ba5d9000dabda..86aad653b7c113106e365a9d4e4c38b3e7737457 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -38,7 +38,7 @@ void show_submodule_summary(FILE *f, const char *path,
                const char *del, const char *add, const char *reset)
 {
        struct rev_info rev;
-       struct commit *commit, *left = left, *right;
+       struct commit *commit, *left = left, *right = right;
        struct commit_list *merge_bases, *list;
        const char *message = NULL;
        struct strbuf sb = STRBUF_INIT;
@@ -92,6 +92,8 @@ void show_submodule_summary(FILE *f, const char *path,
 
        if (!message) {
                while ((commit = get_revision(&rev))) {
+                       struct pretty_print_context ctx = {0};
+                       ctx.date_mode = rev.date_mode;
                        strbuf_setlen(&sb, 0);
                        if (commit->object.flags & SYMMETRIC_LEFT) {
                                if (del)
@@ -99,8 +101,7 @@ void show_submodule_summary(FILE *f, const char *path,
                        }
                        else if (add)
                                strbuf_addstr(&sb, add);
-                       format_commit_message(commit, format, &sb,
-                                       rev.date_mode);
+                       format_commit_message(commit, format, &sb, &ctx);
                        if (reset)
                                strbuf_addstr(&sb, reset);
                        strbuf_addch(&sb, '\n');