summaryrefslogtreecommitdiff
path: root/pretty.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 /pretty.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 'pretty.c')
-rw-r--r--pretty.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/pretty.c b/pretty.c
index f2dee308b8..02a0a2bb43 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1010,6 +1010,7 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder,
get_reflog_selector(sb,
c->pretty_ctx->reflog_info,
c->pretty_ctx->date_mode,
+ c->pretty_ctx->date_mode_explicit,
(placeholder[1] == 'd'));
return 2;
case 's': /* reflog message */