mirror of
https://github.com/git/git.git
synced 2024-12-26 18:24:21 +08:00
7a98d9ab00
Extend the the release_revisions() function so that it frees the "cmdline" in the "struct rev_info". This in combination with a preceding change to free "commits" and "mailmap" means that we can whitelist another test under "TEST_PASSES_SANITIZE_LEAK=true". There was a proposal in [1] to do away with xstrdup()-ing this add_rev_cmdline(), perhaps that would be worthwhile, but for now let's just free() it. We could also make that a "char *" in "struct rev_cmdline_entry" itself, but since we own it let's expose it as a constant to outside callers. I proposed that in [2] but have since changed my mind. See14d30cdfc0(ref-filter: fix memory leak in `free_array_item()`, 2019-07-10),c514c62a4f(checkout: fix leak of non-existent branch names, 2020-08-14) and other log history hits for "free((char *)" for prior art. This includes the tests we had false-positive passes on before my6798b08e84(perl Git.pm: don't ignore signalled failure in _cmd_close(), 2022-02-01), now they pass for real. Since there are 66 tests matching t/t[0-9]*git-svn*.sh it's easier to list those that don't pass than to touch most of those 66. So let's introduce a "TEST_FAILS_SANITIZE_LEAK=true", which if set in the tests won't cause lib-git-svn.sh to set "TEST_PASSES_SANITIZE_LEAK=true. This change also marks all the tests that we removed "TEST_FAILS_SANITIZE_LEAK=true" from in an earlier commit due to removing the UNLEAK() from cmd_format_patch(), we can now assert that its API use doesn't leak any "struct rev_info" memory. This change also made commit "t5503-tagfollow.sh" pass on current master, but that would regress when combined with ps/fetch-atomic-fixup'sde004e848a(t5503: simplify setup of test which exercises failure of backfill, 2022-03-03) (through no fault of that topic, that change started using "git clone" in the test, which has an outstanding leak). Let's leave that test out for now to avoid in-flight semantic conflicts. 1. https://lore.kernel.org/git/YUj%2FgFRh6pwrZalY@carlos-mbp.lan/ 2. https://lore.kernel.org/git/87o88obkb1.fsf@evledraar.gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
124 lines
2.6 KiB
Bash
Executable File
124 lines
2.6 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='apply same filename'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
mkdir -p some/sub/dir &&
|
|
echo Hello > some/sub/dir/file &&
|
|
git add some/sub/dir/file &&
|
|
git commit -m initial &&
|
|
git tag initial
|
|
|
|
'
|
|
|
|
cat > patch << EOF
|
|
diff a/bla/blub/dir/file b/bla/blub/dir/file
|
|
--- a/bla/blub/dir/file
|
|
+++ b/bla/blub/dir/file
|
|
@@ -1,1 +1,1 @@
|
|
-Hello
|
|
+Bello
|
|
EOF
|
|
|
|
test_expect_success 'apply --directory -p (1)' '
|
|
git apply --directory=some/sub -p3 --index patch &&
|
|
echo Bello >expect &&
|
|
git show :some/sub/dir/file >actual &&
|
|
test_cmp expect actual &&
|
|
test_cmp expect some/sub/dir/file
|
|
|
|
'
|
|
|
|
test_expect_success 'apply --directory -p (2) ' '
|
|
|
|
git reset --hard initial &&
|
|
git apply --directory=some/sub/ -p3 --index patch &&
|
|
echo Bello >expect &&
|
|
git show :some/sub/dir/file >actual &&
|
|
test_cmp expect actual &&
|
|
test_cmp expect some/sub/dir/file
|
|
|
|
'
|
|
|
|
cat > patch << EOF
|
|
diff --git a/newfile b/newfile
|
|
new file mode 100644
|
|
index 0000000..d95f3ad
|
|
--- /dev/null
|
|
+++ b/newfile
|
|
@@ -0,0 +1 @@
|
|
+content
|
|
EOF
|
|
|
|
test_expect_success 'apply --directory (new file)' '
|
|
git reset --hard initial &&
|
|
git apply --directory=some/sub/dir/ --index patch &&
|
|
echo content >expect &&
|
|
git show :some/sub/dir/newfile >actual &&
|
|
test_cmp expect actual &&
|
|
test_cmp expect some/sub/dir/newfile
|
|
'
|
|
|
|
cat > patch << EOF
|
|
diff --git a/c/newfile2 b/c/newfile2
|
|
new file mode 100644
|
|
index 0000000..d95f3ad
|
|
--- /dev/null
|
|
+++ b/c/newfile2
|
|
@@ -0,0 +1 @@
|
|
+content
|
|
EOF
|
|
|
|
test_expect_success 'apply --directory -p (new file)' '
|
|
git reset --hard initial &&
|
|
git apply -p2 --directory=some/sub/dir/ --index patch &&
|
|
echo content >expect &&
|
|
git show :some/sub/dir/newfile2 >actual &&
|
|
test_cmp expect actual &&
|
|
test_cmp expect some/sub/dir/newfile2
|
|
'
|
|
|
|
cat > patch << EOF
|
|
diff --git a/delfile b/delfile
|
|
deleted file mode 100644
|
|
index d95f3ad..0000000
|
|
--- a/delfile
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-content
|
|
EOF
|
|
|
|
test_expect_success 'apply --directory (delete file)' '
|
|
git reset --hard initial &&
|
|
echo content >some/sub/dir/delfile &&
|
|
git add some/sub/dir/delfile &&
|
|
git apply --directory=some/sub/dir/ --index patch &&
|
|
git ls-files >out &&
|
|
! grep delfile out
|
|
'
|
|
|
|
cat > patch << 'EOF'
|
|
diff --git "a/qu\157tefile" "b/qu\157tefile"
|
|
new file mode 100644
|
|
index 0000000..d95f3ad
|
|
--- /dev/null
|
|
+++ "b/qu\157tefile"
|
|
@@ -0,0 +1 @@
|
|
+content
|
|
EOF
|
|
|
|
test_expect_success 'apply --directory (quoted filename)' '
|
|
git reset --hard initial &&
|
|
git apply --directory=some/sub/dir/ --index patch &&
|
|
echo content >expect &&
|
|
git show :some/sub/dir/quotefile >actual &&
|
|
test_cmp expect actual &&
|
|
test_cmp expect some/sub/dir/quotefile
|
|
'
|
|
|
|
test_done
|