mirror of
https://github.com/git/git.git
synced 2024-05-30 16:06:13 +02:00
de239446b6
When doing a reflog walk, we use the commit's date to
do any date limiting. In earlier versions of Git, this could
lead to nonsense results, since a skipped commit would
truncate the traversal. So a sequence like:
git commit ...
git checkout week-old-branch
git checkout -
git log -g --since=1.day.ago
would stop at the week-old-branch, even though the "git
commit" entry further back is still interesting.
As of the prior commit, which uses a parent-less traversal
of the reflog, you get the whole reflog minus any commits
whose dates do not match the specified options. This is
arguably useful, as you could scan the reflogs for commits
that originated in a certain range.
But more likely a user doing a reflog walk wants to limit
based on the reflog entries themselves. You can simulate
--until with:
git log -g @{1.day.ago}
but there's no way to ask Git to traverse only back to a
certain date. E.g.:
# show me reflog entries from the past day
git log -g --since=1.day.ago
This patch teaches the revision machinery to prefer the
reflog entry dates to the commit dates when doing a reflog
walk. Technically this is a change in behavior that affects
plumbing, but the previous behavior was so buggy that it's
unlikely anyone was relying on it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
136 lines
3.6 KiB
Bash
Executable File
136 lines
3.6 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='various tests of reflog walk (log -g) behavior'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'set up some reflog entries' '
|
|
test_commit one &&
|
|
test_commit two &&
|
|
git checkout -b side HEAD^ &&
|
|
test_commit three &&
|
|
git merge --no-commit master &&
|
|
echo evil-merge-content >>one.t &&
|
|
test_tick &&
|
|
git commit --no-edit -a
|
|
'
|
|
|
|
do_walk () {
|
|
git log -g --format="%gd %gs" "$@"
|
|
}
|
|
|
|
sq="'"
|
|
test_expect_success 'set up expected reflog' '
|
|
cat >expect.all <<-EOF
|
|
HEAD@{0} commit (merge): Merge branch ${sq}master${sq} into side
|
|
HEAD@{1} commit: three
|
|
HEAD@{2} checkout: moving from master to side
|
|
HEAD@{3} commit: two
|
|
HEAD@{4} commit (initial): one
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'reflog walk shows expected logs' '
|
|
do_walk >actual &&
|
|
test_cmp expect.all actual
|
|
'
|
|
|
|
test_expect_success 'reflog can limit with --no-merges' '
|
|
grep -v merge expect.all >expect &&
|
|
do_walk --no-merges >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'reflog can limit with pathspecs' '
|
|
grep two expect.all >expect &&
|
|
do_walk -- two.t >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'pathspec limiting handles merges' '
|
|
# we pick up:
|
|
# - the initial commit of one
|
|
# - the checkout back to commit one
|
|
# - the evil merge which touched one
|
|
sed -n "1p;3p;5p" expect.all >expect &&
|
|
do_walk -- one.t >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '--parents shows true parents' '
|
|
# convert newlines to spaces
|
|
echo $(git rev-parse HEAD HEAD^1 HEAD^2) >expect &&
|
|
git rev-list -g --parents -1 HEAD >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'walking multiple reflogs shows all' '
|
|
# We expect to see all entries for all reflogs, but interleaved by
|
|
# date, with order on the command line breaking ties. We
|
|
# can use "sort" on the separate lists to generate this,
|
|
# but note two tricks:
|
|
#
|
|
# 1. We use "{" as the delimiter, which lets us skip to the reflog
|
|
# date specifier as our second field, and then our "-n" numeric
|
|
# sort ignores the bits after the timestamp.
|
|
#
|
|
# 2. POSIX leaves undefined whether this is a stable sort or not. So
|
|
# we use "-k 1" to ensure that we see HEAD before master before
|
|
# side when breaking ties.
|
|
{
|
|
do_walk --date=unix HEAD &&
|
|
do_walk --date=unix side &&
|
|
do_walk --date=unix master
|
|
} >expect.raw &&
|
|
sort -t "{" -k 2nr -k 1 <expect.raw >expect &&
|
|
do_walk --date=unix HEAD master side >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'date-limiting does not interfere with other logs' '
|
|
do_walk HEAD@{1979-01-01} HEAD >actual &&
|
|
test_cmp expect.all actual
|
|
'
|
|
|
|
test_expect_success 'min/max age uses entry date to limit' '
|
|
# Flip between commits one and two so each ref update actually
|
|
# does something (and does not get optimized out). We know
|
|
# that the timestamps of those commits will be before our "min".
|
|
|
|
git update-ref -m before refs/heads/minmax one &&
|
|
|
|
test_tick &&
|
|
min=$test_tick &&
|
|
git update-ref -m min refs/heads/minmax two &&
|
|
|
|
test_tick &&
|
|
max=$test_tick &&
|
|
git update-ref -m max refs/heads/minmax one &&
|
|
|
|
test_tick &&
|
|
git update-ref -m after refs/heads/minmax two &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
max
|
|
min
|
|
EOF
|
|
git log -g --since=$min --until=$max --format=%gs minmax >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'walk prefers reflog to ref tip' '
|
|
head=$(git rev-parse HEAD) &&
|
|
one=$(git rev-parse one) &&
|
|
ident="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE" &&
|
|
echo "$head $one $ident broken reflog entry" >>.git/logs/HEAD &&
|
|
|
|
echo $one >expect &&
|
|
git log -g --format=%H -1 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'rev-list -g complains when there are no reflogs' '
|
|
test_must_fail git rev-list -g
|
|
'
|
|
|
|
test_done
|