diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-05-07 14:11:32 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-05-07 14:18:06 -0700 |
commit | 55ccf85a524f6a2d8cb5582d80a2927ff11dfb64 (patch) | |
tree | 1547dcd5e1f48f8427b9b6f11413aab48276e5a9 /pretty.c | |
parent | 794151e9b595ddc2700c0801caabfd27be763e12 (diff) | |
download | git-55ccf85a524f6a2d8cb5582d80a2927ff11dfb64.tar.gz |
reflog-walk: tell explicit --date=default from not having --date at all
Introduction of opt->date_mode_explicit was a step in the right direction,
but lost that crucial bit at the very end of the callchain, and the callee
could not tell an explicitly specified "I want *date* but in default format"
from the built-in default value passed when there was no --date specified.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pretty.c')
-rw-r--r-- | pretty.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -956,9 +956,8 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder, if (c->pretty_ctx->reflog_info) get_reflog_selector(sb, c->pretty_ctx->reflog_info, - c->pretty_ctx->date_mode_explicit ? - c->pretty_ctx->date_mode : - DATE_NORMAL, + c->pretty_ctx->date_mode, + c->pretty_ctx->date_mode_explicit, (placeholder[1] == 'd')); return 2; case 's': /* reflog message */ |