summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-11 11:30:07 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-11 11:30:08 -0700
commitd318a3997a76155795f28ffefb52158c0c4133ab (patch)
tree9bfc9676e442fe7efc66238ab12a15364c097b8e /log-tree.c
parent65029d8224159326e723b7719d18db2f3d5ab8e3 (diff)
parent55ccf85a524f6a2d8cb5582d80a2927ff11dfb64 (diff)
downloadgit-d318a3997a76155795f28ffefb52158c0c4133ab.tar.gz
Merge branch 'jk/maint-reflog-walk-count-vs-time'
Gives a better DWIM behaviour for --pretty=format:%gd, "stash list", and "log -g", depending on how the starting point ("master" vs "master@{0}" vs "master@{now}") and date formatting options (e.g. "--date=iso") are given on the command line. By Jeff King (4) and Junio C Hamano (1) * jk/maint-reflog-walk-count-vs-time: reflog-walk: tell explicit --date=default from not having --date at all reflog-walk: always make HEAD@{0} show indexed selectors reflog-walk: clean up "flag" field of commit_reflog struct log: respect date_mode_explicit with --format:%gd t1411: add more selector index/date tests
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/log-tree.c b/log-tree.c
index 44f0268372..376d973176 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -629,10 +629,9 @@ void show_log(struct rev_info *opt)
* graph info here.
*/
show_reflog_message(opt->reflog_info,
- opt->commit_format == CMIT_FMT_ONELINE,
- opt->date_mode_explicit ?
- opt->date_mode :
- DATE_NORMAL);
+ opt->commit_format == CMIT_FMT_ONELINE,
+ opt->date_mode,
+ opt->date_mode_explicit);
if (opt->commit_format == CMIT_FMT_ONELINE)
return;
}
@@ -652,6 +651,7 @@ void show_log(struct rev_info *opt)
if (ctx.need_8bit_cte >= 0)
ctx.need_8bit_cte = has_non_ascii(opt->add_signoff);
ctx.date_mode = opt->date_mode;
+ ctx.date_mode_explicit = opt->date_mode_explicit;
ctx.abbrev = opt->diffopt.abbrev;
ctx.after_subject = extra_headers;
ctx.preserve_subject = opt->preserve_subject;