mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00: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>
99 lines
2.3 KiB
Bash
Executable file
99 lines
2.3 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2014 Alfred Perlstein
|
|
#
|
|
|
|
test_description='git svn propset tests'
|
|
|
|
TEST_FAILS_SANITIZE_LEAK=true
|
|
. ./lib-git-svn.sh
|
|
|
|
test_expect_success 'setup propset via import' '
|
|
test_when_finished "rm -rf import" &&
|
|
|
|
foo_subdir2="subdir/subdir2/foo_subdir2" &&
|
|
mkdir -p import/subdir/subdir2 &&
|
|
(
|
|
cd import &&
|
|
# for "add props top level"
|
|
>foo &&
|
|
# for "add props relative"
|
|
>subdir/foo_subdir &&
|
|
# for "add props subdir"
|
|
>"$foo_subdir2" &&
|
|
svn_cmd import -m "import for git svn" . "$svnrepo"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'initialize git svn' '
|
|
git svn init "$svnrepo"
|
|
'
|
|
|
|
test_expect_success 'fetch revisions from svn' '
|
|
git svn fetch
|
|
'
|
|
|
|
set_props () {
|
|
subdir="$1"
|
|
file="$2"
|
|
shift;shift;
|
|
(cd "$subdir" &&
|
|
while [ $# -gt 0 ] ; do
|
|
git svn propset "$1" "$2" "$file" || exit 1
|
|
shift;shift;
|
|
done &&
|
|
echo hello >> "$file" &&
|
|
git commit -m "testing propset" "$file")
|
|
}
|
|
|
|
confirm_props () {
|
|
subdir="$1"
|
|
file="$2"
|
|
shift;shift;
|
|
(set -e ; cd "svn_project/$subdir" &&
|
|
while [ $# -gt 0 ] ; do
|
|
test "$(svn_cmd propget "$1" "$file")" = "$2" || exit 1
|
|
shift;shift;
|
|
done)
|
|
}
|
|
|
|
|
|
#The current implementation has a restriction:
|
|
#svn propset will be taken as a delta for svn dcommit only
|
|
#if the file content is also modified
|
|
test_expect_success 'add props top level' '
|
|
set_props "." "foo" "svn:keywords" "FreeBSD=%H" &&
|
|
git svn dcommit &&
|
|
svn_cmd co "$svnrepo" svn_project &&
|
|
confirm_props "." "foo" "svn:keywords" "FreeBSD=%H" &&
|
|
rm -rf svn_project
|
|
'
|
|
|
|
test_expect_success 'add multiple props' '
|
|
set_props "." "foo" \
|
|
"svn:keywords" "FreeBSD=%H" fbsd:nokeywords yes &&
|
|
git svn dcommit &&
|
|
svn_cmd co "$svnrepo" svn_project &&
|
|
confirm_props "." "foo" \
|
|
"svn:keywords" "FreeBSD=%H" fbsd:nokeywords yes &&
|
|
rm -rf svn_project
|
|
'
|
|
|
|
test_expect_success 'add props subdir' '
|
|
set_props "." "$foo_subdir2" svn:keywords "FreeBSD=%H" &&
|
|
git svn dcommit &&
|
|
svn_cmd co "$svnrepo" svn_project &&
|
|
confirm_props "." "$foo_subdir2" "svn:keywords" "FreeBSD=%H" &&
|
|
rm -rf svn_project
|
|
'
|
|
|
|
test_expect_success 'add props relative' '
|
|
set_props "subdir/subdir2" "../foo_subdir" \
|
|
svn:keywords "FreeBSD=%H" &&
|
|
git svn dcommit &&
|
|
svn_cmd co "$svnrepo" svn_project &&
|
|
confirm_props "subdir/subdir2" "../foo_subdir" \
|
|
svn:keywords "FreeBSD=%H" &&
|
|
rm -rf svn_project
|
|
'
|
|
test_done
|