mirror of
https://github.com/git/git.git
synced 2024-11-23 18:05:29 +08:00
9081a421a6
The "checkout" command is one of the main sources of leaks in the test
suite, let's fix the common ones by not leaking from the "struct
branch_info".
Doing this is rather straightforward, albeit verbose, we need to
xstrdup() constant strings going into the struct, and free() the ones
we clobber as we go along.
This also means that we can delete previous partial leak fixes in this
area, i.e. the "path_to_free" accounting added by 96ec7b1e70 (Convert
resolve_ref+xstrdup to new resolve_refdup function, 2011-12-13).
There was some discussion about whether "we should retain the "const
char *" here and cast at free() time, or have it be a "char *". Since
this is not a public API with any sort of API boundary let's use
"char *", as is already being done for the "refname" member of the
same struct.
The tests to mark as passing were found with:
rm .prove; GIT_SKIP_TESTS=t0027 prove -j8 --state=save t[0-9]*.sh :: --immediate
# apply & compile this change
prove -j8 --state=failed :: --immediate
I.e. the ones that were newly passing when the --state=failed command
was run. I left out "t3040-subprojects-basic.sh" and
"t4131-apply-fake-ancestor.sh" to to optimization-level related
differences similar to the ones noted in[1], except that these would
be something the current 'linux-leaks' job would run into.
1. https://lore.kernel.org/git/cover-v3-0.6-00000000000-20211022T175227Z-avarab@gmail.com/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
75 lines
1.6 KiB
Bash
Executable File
75 lines
1.6 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='clone --branch option'
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
check_HEAD() {
|
|
echo refs/heads/"$1" >expect &&
|
|
git symbolic-ref HEAD >actual &&
|
|
test_cmp expect actual
|
|
}
|
|
|
|
check_file() {
|
|
echo "$1" >expect &&
|
|
test_cmp expect file
|
|
}
|
|
|
|
test_expect_success 'setup' '
|
|
mkdir parent &&
|
|
(cd parent && git init &&
|
|
echo one >file && git add file && git commit -m one &&
|
|
git checkout -b two &&
|
|
echo two >file && git add file && git commit -m two &&
|
|
git checkout main) &&
|
|
mkdir empty &&
|
|
(cd empty && git init)
|
|
'
|
|
|
|
test_expect_success 'vanilla clone chooses HEAD' '
|
|
git clone parent clone &&
|
|
(cd clone &&
|
|
check_HEAD main &&
|
|
check_file one
|
|
)
|
|
'
|
|
|
|
test_expect_success 'clone -b chooses specified branch' '
|
|
git clone -b two parent clone-two &&
|
|
(cd clone-two &&
|
|
check_HEAD two &&
|
|
check_file two
|
|
)
|
|
'
|
|
|
|
test_expect_success 'clone -b sets up tracking' '
|
|
(cd clone-two &&
|
|
echo origin >expect &&
|
|
git config branch.two.remote >actual &&
|
|
echo refs/heads/two >>expect &&
|
|
git config branch.two.merge >>actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'clone -b does not munge remotes/origin/HEAD' '
|
|
(cd clone-two &&
|
|
echo refs/remotes/origin/main >expect &&
|
|
git symbolic-ref refs/remotes/origin/HEAD >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'clone -b with bogus branch' '
|
|
test_must_fail git clone -b bogus parent clone-bogus
|
|
'
|
|
|
|
test_expect_success 'clone -b not allowed with empty repos' '
|
|
test_must_fail git clone -b branch empty clone-branch-empty
|
|
'
|
|
|
|
test_done
|