Merge branch 'jk/maint-add-empty'

diff --git a/reflog-walk.c b/reflog-walk.c
index f751fdc8d832cae54647c1a70d888e979d324fd8..5623ea6b48a2f355e8866eabb2805b51b4127a4a 100644 (file)
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -241,8 +241,8 @@ void fake_reflog_parent(struct reflog_walk_info *info, struct commit *commit)
        commit->object.flags &= ~(ADDED | SEEN | SHOWN);
 }
 
-void show_reflog_message(struct reflog_walk_info* info, int oneline,
-       int relative_date)
+void show_reflog_message(struct reflog_walk_info *info, int oneline,
+       enum date_mode dmode)
 {
        if (info && info->last_commit_reflog) {
                struct commit_reflog *commit_reflog = info->last_commit_reflog;
@@ -251,8 +251,10 @@ void show_reflog_message(struct reflog_walk_info* info, int oneline,
                info = &commit_reflog->reflogs->items[commit_reflog->recno+1];
                if (oneline) {
                        printf("%s@{", commit_reflog->reflogs->ref);
-                       if (commit_reflog->flag || relative_date)
-                               printf("%s", show_date(info->timestamp, 0, 1));
+                       if (commit_reflog->flag || dmode)
+                               printf("%s", show_date(info->timestamp,
+                                                      info->tz,
+                                                      dmode));
                        else
                                printf("%d", commit_reflog->reflogs->nr
                                       - 2 - commit_reflog->recno);
@@ -260,10 +262,10 @@ void show_reflog_message(struct reflog_walk_info* info, int oneline,
                }
                else {
                        printf("Reflog: %s@{", commit_reflog->reflogs->ref);
-                       if (commit_reflog->flag || relative_date)
+                       if (commit_reflog->flag || dmode)
                                printf("%s", show_date(info->timestamp,
                                                        info->tz,
-                                                       relative_date));
+                                                       dmode));
                        else
                                printf("%d", commit_reflog->reflogs->nr
                                       - 2 - commit_reflog->recno);