Commit 794151e9 authored by Jeff King's avatar Jeff King Committed by Junio C Hamano

reflog-walk: always make [email protected]{0} show indexed selectors

When we are showing reflog selectors during a walk, we infer
from context whether the user wanted to see the index in
each selector, or the reflog date. The current rules are:

  1. if the user asked for an explicit date format in the
     output, show the date

  2. if the user asked for [email protected]{now}, show the date

  3. if neither is true, show the index

However,  if we see "[email protected]{0}", that should be a strong clue
that the user wants to see the counted version. In fact, it
should be much stronger than the date format in (1). The
user may have been setting the date format to use in another
part of the output (e.g., in --format="%gd (%ad)", they may
have wanted to influence the author date).

This patch flips the rules to:

  1. if the user asked for [email protected]{0}, always show the index

  2. if the user asked for [email protected]{now}, always show the date

  3. otherwise, we have just "ref"; show them counted by
     default, but respect the presence of "--date" as a clue
     that the user wanted them date-based
Signed-off-by: default avatarJeff King <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent a763126b
......@@ -272,7 +272,8 @@ void get_reflog_selector(struct strbuf *sb,
strbuf_addf(sb, "%[email protected]{", printed_ref);
if (commit_reflog->selector == SELECTOR_DATE || dmode) {
if (commit_reflog->selector == SELECTOR_DATE ||
(commit_reflog->selector == SELECTOR_NONE && dmode)) {
info = &commit_reflog->reflogs->items[commit_reflog->recno+1];
strbuf_addstr(sb, show_date(info->timestamp, info->tz, dmode));
} else {
......@@ -127,6 +127,14 @@ test_expect_success ' does not invoke "--date" magic (format=%gd)' '
test_cmp expect actual
cat >expect <<'EOF'
[email protected]{0}
test_expect_success '--date magic does not override explicit @{0} syntax' '
git log -g -1 --format=%gd --date=raw [email protected]{0} >actual &&
test_cmp expect actual
: >expect
test_expect_success 'empty reflog file' '
git branch empty &&
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment