path: root/builtin/rev-list.c
diff options
authorJeff King <>2012-05-04 05:25:18 (GMT)
committerJunio C Hamano <>2012-05-04 16:39:14 (GMT)
commitf026c7563a249da9279e664fed16fcd5f55c62db (patch)
treea4e22627812c29094e164758ea4faa1891a91470 /builtin/rev-list.c
parent7904af1c10d2feb2f6d1dcb22454d93168a88c49 (diff)
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 "" 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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'builtin/rev-list.c')
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 56727e8..fe0fb20 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -104,6 +104,7 @@ static void show_commit(struct commit *commit, void *data)
struct pretty_print_context ctx = {0};
ctx.abbrev = revs->abbrev;
ctx.date_mode = revs->date_mode;
+ ctx.date_mode_explicit = revs->date_mode_explicit;
ctx.fmt = revs->commit_format;
pretty_print_commit(&ctx, commit, &buf);
if (revs->graph) {