git-commit-vandalism/t/t6101-rev-parse-parents.sh
Ævar Arnfjörð Bjarmason e75d2f7f73 revisions API: have release_revisions() release "filter"
Extend the the release_revisions() function so that it frees the
"filter" in the "struct rev_info". This in combination with a
preceding change to free "cmdline" means that we can mark another set
of tests as passing under "TEST_PASSES_SANITIZE_LEAK=true".

The "filter" member was added recently in ffaa137f64 (revision: put
object filter into struct rev_info, 2022-03-09), and this fixes leaks
intruded in the subsequent leak 7940941de1 (pack-objects: use
rev.filter when possible, 2022-03-09) and 105c6f14ad (bundle: parse
filter capability, 2022-03-09).

The "builtin/pack-objects.c" leak in 7940941de1 was effectively with
us already, but the variable was referred to by a "static" file-scoped
variable. The "bundle.c " leak in 105c6f14ad was newly introduced
with the new "filter" feature for bundles.

The "t5600-clone-fail-cleanup.sh" change here to add
"TEST_PASSES_SANITIZE_LEAK=true" is one of the cases where
run-command.c in not carrying the abort() exit code upwards would have
had that test passing before, but now it *actually* passes[1]. We
should fix the lack of 1=1 mapping of SANITIZE=leak testing to actual
leaks some other time, but it's an existing edge case, let's just mark
the really-passing test as passing for now.

1. https://lore.kernel.org/git/220303.86fsnz5o9w.gmgdl@evledraar.gmail.com/

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-13 23:56:09 -07:00

230 lines
5.7 KiB
Bash
Executable File

#!/bin/sh
#
# Copyright (c) 2005 Johannes Schindelin
#
test_description='Test git rev-parse with different parent options'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_cmp_rev_output () {
git rev-parse --verify "$1" >expect &&
eval "$2" >actual &&
test_cmp expect actual
}
test_expect_success 'setup' '
test_commit start &&
test_commit second &&
git checkout --orphan tmp &&
test_commit start2 &&
git checkout main &&
git merge -m next --allow-unrelated-histories start2 &&
test_commit final &&
test_seq 40 |
while read i
do
git checkout --orphan "b$i" &&
test_tick &&
git commit --allow-empty -m "$i" &&
commit=$(git rev-parse --verify HEAD) &&
printf "$commit " >>.git/info/grafts || return 1
done
'
test_expect_success 'start is valid' '
git rev-parse start | grep "^$OID_REGEX$"
'
test_expect_success 'start^0' '
test_cmp_rev_output tags/start "git rev-parse start^0"
'
test_expect_success 'start^1 not valid' '
test_must_fail git rev-parse --verify start^1
'
test_expect_success 'second^1 = second^' '
test_cmp_rev_output second^ "git rev-parse second^1"
'
test_expect_success 'final^1^1^1' '
test_cmp_rev_output start "git rev-parse final^1^1^1"
'
test_expect_success 'final^1^1^1 = final^^^' '
test_cmp_rev_output final^^^ "git rev-parse final^1^1^1"
'
test_expect_success 'final^1^2' '
test_cmp_rev_output start2 "git rev-parse final^1^2"
'
test_expect_success 'final^1^2 != final^1^1' '
test $(git rev-parse final^1^2) != $(git rev-parse final^1^1)
'
test_expect_success 'final^1^3 not valid' '
test_must_fail git rev-parse --verify final^1^3
'
test_expect_success '--verify start2^1' '
test_must_fail git rev-parse --verify start2^1
'
test_expect_success '--verify start2^0' '
git rev-parse --verify start2^0
'
test_expect_success 'final^1^@ = final^1^1 final^1^2' '
git rev-parse final^1^1 final^1^2 >expect &&
git rev-parse final^1^@ >actual &&
test_cmp expect actual
'
test_expect_success 'symbolic final^1^@ = final^1^1 final^1^2' '
git rev-parse --symbolic final^1^1 final^1^2 >expect &&
git rev-parse --symbolic final^1^@ >actual &&
test_cmp expect actual
'
test_expect_success 'final^1^! = final^1 ^final^1^1 ^final^1^2' '
git rev-parse final^1 ^final^1^1 ^final^1^2 >expect &&
git rev-parse final^1^! >actual &&
test_cmp expect actual
'
test_expect_success 'symbolic final^1^! = final^1 ^final^1^1 ^final^1^2' '
git rev-parse --symbolic final^1 ^final^1^1 ^final^1^2 >expect &&
git rev-parse --symbolic final^1^! >actual &&
test_cmp expect actual
'
test_expect_success 'large graft octopus' '
test_cmp_rev_output b31 "git rev-parse --verify b1^30"
'
test_expect_success 'repack for next test' '
git repack -a -d
'
test_expect_success 'short SHA-1 works' '
start=$(git rev-parse --verify start) &&
test_cmp_rev_output start "git rev-parse ${start%?}"
'
# rev^- tests; we can use a simpler setup for these
test_expect_success 'setup for rev^- tests' '
test_commit one &&
test_commit two &&
test_commit three &&
# Merge in a branch for testing rev^-
git checkout -b branch &&
git checkout HEAD^^ &&
git merge -m merge --no-edit --no-ff branch &&
git checkout -b merge
'
# The merged branch has 2 commits + the merge
test_expect_success 'rev-list --count merge^- = merge^..merge' '
git rev-list --count merge^..merge >expect &&
echo 3 >actual &&
test_cmp expect actual
'
# All rev^- rev-parse tests
test_expect_success 'rev-parse merge^- = merge^..merge' '
git rev-parse merge^..merge >expect &&
git rev-parse merge^- >actual &&
test_cmp expect actual
'
test_expect_success 'rev-parse merge^-1 = merge^..merge' '
git rev-parse merge^1..merge >expect &&
git rev-parse merge^-1 >actual &&
test_cmp expect actual
'
test_expect_success 'rev-parse merge^-2 = merge^2..merge' '
git rev-parse merge^2..merge >expect &&
git rev-parse merge^-2 >actual &&
test_cmp expect actual
'
test_expect_success 'symbolic merge^-1 = merge^1..merge' '
git rev-parse --symbolic merge^1..merge >expect &&
git rev-parse --symbolic merge^-1 >actual &&
test_cmp expect actual
'
test_expect_success 'rev-parse merge^-0 (invalid parent)' '
test_must_fail git rev-parse merge^-0
'
test_expect_success 'rev-parse merge^-3 (invalid parent)' '
test_must_fail git rev-parse merge^-3
'
test_expect_success 'rev-parse merge^-^ (garbage after ^-)' '
test_must_fail git rev-parse merge^-^
'
test_expect_success 'rev-parse merge^-1x (garbage after ^-1)' '
test_must_fail git rev-parse merge^-1x
'
# All rev^- rev-list tests (should be mostly the same as rev-parse; the reason
# for the duplication is that rev-parse and rev-list use different parsers).
test_expect_success 'rev-list merge^- = merge^..merge' '
git rev-list merge^..merge >expect &&
git rev-list merge^- >actual &&
test_cmp expect actual
'
test_expect_success 'rev-list merge^-1 = merge^1..merge' '
git rev-list merge^1..merge >expect &&
git rev-list merge^-1 >actual &&
test_cmp expect actual
'
test_expect_success 'rev-list merge^-2 = merge^2..merge' '
git rev-list merge^2..merge >expect &&
git rev-list merge^-2 >actual &&
test_cmp expect actual
'
test_expect_success 'rev-list merge^-0 (invalid parent)' '
test_must_fail git rev-list merge^-0
'
test_expect_success 'rev-list merge^-3 (invalid parent)' '
test_must_fail git rev-list merge^-3
'
test_expect_success 'rev-list merge^-^ (garbage after ^-)' '
test_must_fail git rev-list merge^-^
'
test_expect_success 'rev-list merge^-1x (garbage after ^-1)' '
test_must_fail git rev-list merge^-1x
'
test_expect_success 'rev-parse $garbage^@ does not segfault' '
test_must_fail git rev-parse $EMPTY_TREE^@
'
test_expect_success 'rev-parse $garbage...$garbage does not segfault' '
test_must_fail git rev-parse $EMPTY_TREE...$EMPTY_BLOB
'
test_done