mirror of
https://github.com/git/git
synced 2024-08-28 03:59:25 +00:00
8aae3cf755
The add_reflog_for_walk() function keeps a cache mapping
refnames to their reflog contents. We use a cached reflog
entry if available, and otherwise allocate and store a new
one.
Since 5026b47175 (add_reflog_for_walk: avoid memory leak,
2017-05-04), when we hit an error parsing a date-based
reflog spec, we free the reflog memory but leave the cache
entry pointing to the now-freed memory.
We can fix this by just leaving the memory intact once it
has made it into the cache. This may leave an unused entry
in the cache, but that's OK. And it means we also catch a
similar situation: we may not have allocated at all in this
invocation, but simply be pointing to a cached entry from a
previous invocation (which is relying on that entry being
present).
The new test in t1411 exercises this case and fails when run
with --valgrind or ASan.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
185 lines
4.7 KiB
Bash
Executable file
185 lines
4.7 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='Test reflog display routines'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
echo content >file &&
|
|
git add file &&
|
|
test_tick &&
|
|
git commit -m one
|
|
'
|
|
|
|
cat >expect <<'EOF'
|
|
Reflog: HEAD@{0} (C O Mitter <committer@example.com>)
|
|
Reflog message: commit (initial): one
|
|
EOF
|
|
test_expect_success 'log -g shows reflog headers' '
|
|
git log -g -1 >tmp &&
|
|
grep ^Reflog <tmp >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expect <<'EOF'
|
|
e46513e HEAD@{0}: commit (initial): one
|
|
EOF
|
|
test_expect_success 'oneline reflog format' '
|
|
git log -g -1 --oneline >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'reflog default format' '
|
|
git reflog -1 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expect <<'EOF'
|
|
commit e46513e
|
|
Reflog: HEAD@{0} (C O Mitter <committer@example.com>)
|
|
Reflog message: commit (initial): one
|
|
Author: A U Thor <author@example.com>
|
|
|
|
one
|
|
EOF
|
|
test_expect_success 'override reflog default format' '
|
|
git reflog --format=short -1 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expect <<'EOF'
|
|
Reflog: HEAD@{Thu Apr 7 15:13:13 2005 -0700} (C O Mitter <committer@example.com>)
|
|
Reflog message: commit (initial): one
|
|
EOF
|
|
test_expect_success 'using @{now} syntax shows reflog date (multiline)' '
|
|
git log -g -1 HEAD@{now} >tmp &&
|
|
grep ^Reflog <tmp >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expect <<'EOF'
|
|
e46513e HEAD@{Thu Apr 7 15:13:13 2005 -0700}: commit (initial): one
|
|
EOF
|
|
test_expect_success 'using @{now} syntax shows reflog date (oneline)' '
|
|
git log -g -1 --oneline HEAD@{now} >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expect <<'EOF'
|
|
HEAD@{Thu Apr 7 15:13:13 2005 -0700}
|
|
EOF
|
|
test_expect_success 'using @{now} syntax shows reflog date (format=%gd)' '
|
|
git log -g -1 --format=%gd HEAD@{now} >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expect <<'EOF'
|
|
Reflog: HEAD@{Thu Apr 7 15:13:13 2005 -0700} (C O Mitter <committer@example.com>)
|
|
Reflog message: commit (initial): one
|
|
EOF
|
|
test_expect_success 'using --date= shows reflog date (multiline)' '
|
|
git log -g -1 --date=default >tmp &&
|
|
grep ^Reflog <tmp >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expect <<'EOF'
|
|
e46513e HEAD@{Thu Apr 7 15:13:13 2005 -0700}: commit (initial): one
|
|
EOF
|
|
test_expect_success 'using --date= shows reflog date (oneline)' '
|
|
git log -g -1 --oneline --date=default >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expect <<'EOF'
|
|
HEAD@{1112911993 -0700}
|
|
EOF
|
|
test_expect_success 'using --date= shows reflog date (format=%gd)' '
|
|
git log -g -1 --format=%gd --date=raw >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expect <<'EOF'
|
|
Reflog: HEAD@{0} (C O Mitter <committer@example.com>)
|
|
Reflog message: commit (initial): one
|
|
EOF
|
|
test_expect_success 'log.date does not invoke "--date" magic (multiline)' '
|
|
test_config log.date raw &&
|
|
git log -g -1 >tmp &&
|
|
grep ^Reflog <tmp >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expect <<'EOF'
|
|
e46513e HEAD@{0}: commit (initial): one
|
|
EOF
|
|
test_expect_success 'log.date does not invoke "--date" magic (oneline)' '
|
|
test_config log.date raw &&
|
|
git log -g -1 --oneline >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expect <<'EOF'
|
|
HEAD@{0}
|
|
EOF
|
|
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
|
|
'
|
|
|
|
cat >expect <<'EOF'
|
|
HEAD@{0}
|
|
EOF
|
|
test_expect_success '--date magic does not override explicit @{0} syntax' '
|
|
git log -g -1 --format=%gd --date=raw HEAD@{0} >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
: >expect
|
|
test_expect_success 'empty reflog file' '
|
|
git branch empty &&
|
|
git reflog expire --expire=all refs/heads/empty &&
|
|
|
|
git log -g empty >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
# This guards against the alternative of showing the diffs vs. the
|
|
# reflog ancestor. The reflog used is designed to list the commits
|
|
# more than once, so as to exercise the corresponding logic.
|
|
test_expect_success 'git log -g -p shows diffs vs. parents' '
|
|
test_commit two &&
|
|
git branch flipflop &&
|
|
git update-ref refs/heads/flipflop -m flip1 HEAD^ &&
|
|
git update-ref refs/heads/flipflop -m flop1 HEAD &&
|
|
git update-ref refs/heads/flipflop -m flip2 HEAD^ &&
|
|
git log -g -p flipflop >reflog &&
|
|
grep -v ^Reflog reflog >actual &&
|
|
git log -1 -p HEAD^ >log.one &&
|
|
git log -1 -p HEAD >log.two &&
|
|
(
|
|
cat log.one; echo
|
|
cat log.two; echo
|
|
cat log.one; echo
|
|
cat log.two
|
|
) >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'reflog exists works' '
|
|
git reflog exists refs/heads/master &&
|
|
! git reflog exists refs/heads/nonexistent
|
|
'
|
|
|
|
# The behavior with two reflogs is buggy and the output is in flux; for now
|
|
# we're just checking that the program works at all without segfaulting.
|
|
test_expect_success 'showing multiple reflogs works' '
|
|
git log -g HEAD HEAD >actual
|
|
'
|
|
|
|
test_expect_success 'showing multiple reflogs with an old date' '
|
|
git log -g HEAD@{1979-01-01} HEAD >actual
|
|
'
|
|
|
|
test_done
|