diff options
author | Jeff King <peff@peff.net> | 2012-05-04 01:25:18 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-05-04 09:39:14 -0700 |
commit | f026c7563a249da9279e664fed16fcd5f55c62db (patch) | |
tree | a4e22627812c29094e164758ea4faa1891a91470 /t/t1411-reflog-show.sh | |
parent | 7904af1c10d2feb2f6d1dcb22454d93168a88c49 (diff) | |
download | git-f026c7563a249da9279e664fed16fcd5f55c62db.tar.gz git-f026c7563a249da9279e664fed16fcd5f55c62db.tar.xz |
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 't/t1411-reflog-show.sh')
-rwxr-xr-x | t/t1411-reflog-show.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh index 4706f4c50..88247f874 100755 --- a/t/t1411-reflog-show.sh +++ b/t/t1411-reflog-show.sh @@ -121,7 +121,7 @@ test_expect_success 'log.date does not invoke "--date" magic (oneline)' ' cat >expect <<'EOF' HEAD@{0} EOF -test_expect_failure 'log.date does not invoke "--date" magic (format=%gd)' ' +test_expect_success 'log.date does not invoke "--date" magic (format=%gd)' ' test_config log.date raw && git log -g -1 --format=%gd >actual && test_cmp expect actual |