mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
![Ævar Arnfjörð Bjarmason](/assets/img/avatar_default.png)
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>
102 lines
3.1 KiB
Bash
Executable file
102 lines
3.1 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='Merge-recursive merging renames'
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
cat >A <<-\EOF &&
|
|
a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
|
b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
|
|
c cccccccccccccccccccccccccccccccccccccccccccccccc
|
|
d dddddddddddddddddddddddddddddddddddddddddddddddd
|
|
e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
|
|
f ffffffffffffffffffffffffffffffffffffffffffffffff
|
|
g gggggggggggggggggggggggggggggggggggggggggggggggg
|
|
h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
|
|
i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
|
|
j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
|
|
k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
|
|
l llllllllllllllllllllllllllllllllllllllllllllllll
|
|
m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
|
|
n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
|
|
o oooooooooooooooooooooooooooooooooooooooooooooooo
|
|
EOF
|
|
|
|
cat >M <<-\EOF &&
|
|
A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
|
B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
|
|
C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
|
|
D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
|
|
E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
|
|
F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
|
|
G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
|
|
H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
|
|
I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
|
|
J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
|
|
K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
|
|
L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
|
|
M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
|
|
N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
|
|
O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
|
|
EOF
|
|
|
|
git add A M &&
|
|
git commit -m "initial has A and M" &&
|
|
git branch white &&
|
|
git branch red &&
|
|
git branch blue &&
|
|
|
|
git checkout white &&
|
|
sed -e "/^g /s/.*/g : white changes a line/" <A >B &&
|
|
sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
|
|
rm -f A M &&
|
|
git update-index --add --remove A B M N &&
|
|
git commit -m "white renames A->B, M->N" &&
|
|
|
|
git checkout red &&
|
|
echo created by red >R &&
|
|
git update-index --add R &&
|
|
git commit -m "red creates R" &&
|
|
|
|
git checkout blue &&
|
|
sed -e "/^o /s/.*/g : blue changes a line/" <A >B &&
|
|
rm -f A &&
|
|
mv B A &&
|
|
git update-index A &&
|
|
git commit -m "blue modify A" &&
|
|
|
|
git checkout main
|
|
'
|
|
|
|
# This test broke in 65ac6e9c3f47807cb603af07a6a9e1a43bc119ae
|
|
test_expect_success 'merge white into red (A->B,M->N)' '
|
|
git checkout -b red-white red &&
|
|
git merge white &&
|
|
git write-tree &&
|
|
test_path_is_file B &&
|
|
test_path_is_file N &&
|
|
test_path_is_file R &&
|
|
test_path_is_missing A &&
|
|
test_path_is_missing M
|
|
'
|
|
|
|
# This test broke in 8371234ecaaf6e14fe3f2082a855eff1bbd79ae9
|
|
test_expect_success 'merge blue into white (A->B, mod A, A untracked)' '
|
|
git checkout -b white-blue white &&
|
|
echo dirty >A &&
|
|
git merge blue &&
|
|
git write-tree &&
|
|
test_path_is_file A &&
|
|
echo dirty >expect &&
|
|
test_cmp expect A &&
|
|
test_path_is_file B &&
|
|
test_path_is_file N &&
|
|
test_path_is_missing M
|
|
'
|
|
|
|
test_done
|