@ -227,7 +227,8 @@ void fake_reflog_parent(struct reflog_walk_info *info, struct commit *commit)
commit->object.flags &= ~(ADDED | SEEN | SHOWN);
commit->object.flags &= ~(ADDED | SEEN | SHOWN);
}
}
void show_reflog_message(struct reflog_walk_info* info, int oneline)
void show_reflog_message(struct reflog_walk_info* info, int oneline,
int relative_date)
{
{
if (info && info->last_commit_reflog) {
if (info && info->last_commit_reflog) {
struct commit_reflog *commit_reflog = info->last_commit_reflog;
struct commit_reflog *commit_reflog = info->last_commit_reflog;
@ -236,7 +237,7 @@ void show_reflog_message(struct reflog_walk_info* info, int oneline)
info = &commit_reflog->reflogs->items[commit_reflog->recno+1];
info = &commit_reflog->reflogs->items[commit_reflog->recno+1];
if (oneline) {
if (oneline) {
printf("%s@{", commit_reflog->reflogs->ref);
printf("%s@{", commit_reflog->reflogs->ref);
if (commit_reflog->flag)
if (commit_reflog->flag || relative_date)
printf("%s", show_date(info->timestamp, 0, 1));
printf("%s", show_date(info->timestamp, 0, 1));
else
else
printf("%d", commit_reflog->reflogs->nr
printf("%d", commit_reflog->reflogs->nr
@ -245,9 +246,10 @@ void show_reflog_message(struct reflog_walk_info* info, int oneline)
}
}
else {
else {
printf("Reflog: %s@{", commit_reflog->reflogs->ref);
printf("Reflog: %s@{", commit_reflog->reflogs->ref);
if (commit_reflog->flag)
if (commit_reflog->flag || relative_date)
printf("%s", show_rfc2822_date(info->timestamp,
printf("%s", show_date(info->timestamp,
info->tz));
info->tz,
relative_date));
else
else
printf("%d", commit_reflog->reflogs->nr
printf("%d", commit_reflog->reflogs->nr
- 2 - commit_reflog->recno);
- 2 - commit_reflog->recno);