summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-05-04 01:25:18 -0400
committerJunio C Hamano <gitster@pobox.com>2012-05-04 09:39:14 -0700
commitf026c7563a249da9279e664fed16fcd5f55c62db (patch)
treea4e22627812c29094e164758ea4faa1891a91470 /pretty.c
parent7904af1c10d2feb2f6d1dcb22454d93168a88c49 (diff)
downloadgit-f026c7563a249da9279e664fed16fcd5f55c62db.tar.gz
log: respect date_mode_explicit with --format:%gd
When we show a reflog selector (e.g., via "git log -g"), we perform some DWIM magic: while we normally show the entry's index (e.g., HEAD@{1}), if the user has given us a date with "--date", then we show a date-based select (e.g., HEAD@{yesterday}). However, we don't want to trigger this magic if the alternate date format we got was from the "log.date" configuration; that is not sufficiently strong context for us to invoke this particular magic. To fix this, commit f4ea32f (improve reflog date/number heuristic, 2009-09-24) introduced a "date_mode_explicit" flag in rev_info. This flag is set only when we see a "--date" option on the command line, and we a vanilla date to the reflog code if the date was not explicit. Later, commit 8f8f547 (Introduce new pretty formats %g[sdD] for reflog information, 2009-10-19) added another way to show selectors, and it did not respect the date_mode_explicit flag from f4ea32f. This patch propagates the date_mode_explicit flag to the pretty-print code, which can then use it to pass the appropriate date field to the reflog code. This brings the behavior of "%gd" in line with the other formats, and means that its output is independent of any user configuration. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pretty.c')
-rw-r--r--pretty.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/pretty.c b/pretty.c
index f45eb54e4c..efd62e8ae7 100644
--- a/pretty.c
+++ b/pretty.c
@@ -956,7 +956,9 @@ 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,
+ c->pretty_ctx->date_mode_explicit ?
+ c->pretty_ctx->date_mode :
+ DATE_NORMAL,
(placeholder[1] == 'd'));
return 2;
case 's': /* reflog message */