Merge branch 'maint-2.5' into maint-2.6

diff --git a/test-revision-walking.c b/test-revision-walking.c
index 3ade02c72d8801a4965431518f796df4835dc473..285f06b7ff262378150be80f2a09b4162ae3a564 100644 (file)
--- a/test-revision-walking.c
+++ b/test-revision-walking.c
@@ -17,7 +17,7 @@ static void print_commit(struct commit *commit)
 {
        struct strbuf sb = STRBUF_INIT;
        struct pretty_print_context ctx = {0};
-       ctx.date_mode = DATE_NORMAL;
+       ctx.date_mode.type = DATE_NORMAL;
        format_commit_message(commit, " %m %s", &sb, &ctx);
        printf("%s\n", sb.buf);
        strbuf_release(&sb);