2011-07-20 22:37:26 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2011 Ray Chen
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='git svn test (option --preserve-empty-dirs)
|
|
|
|
|
|
|
|
This test uses git to clone a Subversion repository that contains empty
|
|
|
|
directories, and checks that corresponding directories are created in the
|
|
|
|
local Git repository with placeholder files.'
|
|
|
|
|
revisions API: have release_revisions() release "cmdline"
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. See
14d30cdfc04 (ref-filter: fix memory leak in `free_array_item()`,
2019-07-10), c514c62a4fd (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 my
6798b08e848 (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's de004e848a9 (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>
2022-04-13 20:01:47 +00:00
|
|
|
TEST_FAILS_SANITIZE_LEAK=true
|
2011-07-20 22:37:26 +00:00
|
|
|
. ./lib-git-svn.sh
|
|
|
|
|
|
|
|
GIT_REPO=git-svn-repo
|
|
|
|
|
|
|
|
test_expect_success 'initialize source svn repo containing empty dirs' '
|
|
|
|
svn_cmd mkdir -m x "$svnrepo"/trunk &&
|
|
|
|
svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
|
|
|
|
(
|
|
|
|
cd "$SVN_TREE" &&
|
|
|
|
mkdir -p 1 2 3/a 3/b 4 5 6 &&
|
|
|
|
echo "First non-empty file" > 2/file1.txt &&
|
|
|
|
echo "Second non-empty file" > 2/file2.txt &&
|
|
|
|
echo "Third non-empty file" > 3/a/file1.txt &&
|
|
|
|
echo "Fourth non-empty file" > 3/b/file1.txt &&
|
|
|
|
svn_cmd add 1 2 3 4 5 6 &&
|
|
|
|
svn_cmd commit -m "initial commit" &&
|
|
|
|
|
|
|
|
mkdir 4/a &&
|
|
|
|
svn_cmd add 4/a &&
|
|
|
|
svn_cmd commit -m "nested empty directory" &&
|
|
|
|
mkdir 4/a/b &&
|
|
|
|
svn_cmd add 4/a/b &&
|
|
|
|
svn_cmd commit -m "deeply nested empty directory" &&
|
|
|
|
mkdir 4/a/b/c &&
|
|
|
|
svn_cmd add 4/a/b/c &&
|
|
|
|
svn_cmd commit -m "really deeply nested empty directory" &&
|
|
|
|
echo "Kill the placeholder file" > 4/a/b/c/foo &&
|
|
|
|
svn_cmd add 4/a/b/c/foo &&
|
|
|
|
svn_cmd commit -m "Regular file to remove placeholder" &&
|
|
|
|
|
|
|
|
svn_cmd del 2/file2.txt &&
|
|
|
|
svn_cmd del 3/b &&
|
|
|
|
svn_cmd commit -m "delete non-last entry in directory" &&
|
|
|
|
|
|
|
|
svn_cmd del 2/file1.txt &&
|
|
|
|
svn_cmd del 3/a &&
|
|
|
|
svn_cmd commit -m "delete last entry in directory" &&
|
|
|
|
|
|
|
|
echo "Conflict file" > 5/.placeholder &&
|
|
|
|
mkdir 6/.placeholder &&
|
|
|
|
svn_cmd add 5/.placeholder 6/.placeholder &&
|
|
|
|
svn_cmd commit -m "Placeholder Namespace conflict"
|
|
|
|
) &&
|
|
|
|
rm -rf "$SVN_TREE"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'clone svn repo with --preserve-empty-dirs' '
|
|
|
|
git svn clone "$svnrepo"/trunk --preserve-empty-dirs "$GIT_REPO"
|
|
|
|
'
|
|
|
|
|
|
|
|
# "$GIT_REPO"/1 should only contain the placeholder file.
|
|
|
|
test_expect_success 'directory empty from inception' '
|
|
|
|
test -f "$GIT_REPO"/1/.gitignore &&
|
|
|
|
test $(find "$GIT_REPO"/1 -type f | wc -l) = "1"
|
|
|
|
'
|
|
|
|
|
|
|
|
# "$GIT_REPO"/2 and "$GIT_REPO"/3 should only contain the placeholder file.
|
|
|
|
test_expect_success 'directory empty from subsequent svn commit' '
|
|
|
|
test -f "$GIT_REPO"/2/.gitignore &&
|
|
|
|
test $(find "$GIT_REPO"/2 -type f | wc -l) = "1" &&
|
|
|
|
test -f "$GIT_REPO"/3/.gitignore &&
|
|
|
|
test $(find "$GIT_REPO"/3 -type f | wc -l) = "1"
|
|
|
|
'
|
|
|
|
|
|
|
|
# No placeholder files should exist in "$GIT_REPO"/4, even though one was
|
|
|
|
# generated for every sub-directory at some point in the repo's history.
|
|
|
|
test_expect_success 'add entry to previously empty directory' '
|
|
|
|
test $(find "$GIT_REPO"/4 -type f | wc -l) = "1" &&
|
|
|
|
test -f "$GIT_REPO"/4/a/b/c/foo
|
|
|
|
'
|
|
|
|
|
|
|
|
# The HEAD~2 commit should not have introduced .gitignore placeholder files.
|
|
|
|
test_expect_success 'remove non-last entry from directory' '
|
|
|
|
(
|
|
|
|
cd "$GIT_REPO" &&
|
|
|
|
git checkout HEAD~2
|
|
|
|
) &&
|
2020-04-20 08:54:43 +00:00
|
|
|
test_path_is_missing "$GIT_REPO"/2/.gitignore &&
|
|
|
|
test_path_is_missing "$GIT_REPO"/3/.gitignore
|
2011-07-20 22:37:26 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
# After re-cloning the repository with --placeholder-file specified, there
|
|
|
|
# should be 5 files named ".placeholder" in the local Git repo.
|
|
|
|
test_expect_success 'clone svn repo with --placeholder-file specified' '
|
|
|
|
rm -rf "$GIT_REPO" &&
|
|
|
|
git svn clone "$svnrepo"/trunk --preserve-empty-dirs \
|
|
|
|
--placeholder-file=.placeholder "$GIT_REPO" &&
|
|
|
|
find "$GIT_REPO" -type f -name ".placeholder" &&
|
|
|
|
test $(find "$GIT_REPO" -type f -name ".placeholder" | wc -l) = "5"
|
|
|
|
'
|
|
|
|
|
|
|
|
# "$GIT_REPO"/5/.placeholder should be a file, and non-empty.
|
|
|
|
test_expect_success 'placeholder namespace conflict with file' '
|
|
|
|
test -s "$GIT_REPO"/5/.placeholder
|
|
|
|
'
|
|
|
|
|
|
|
|
# "$GIT_REPO"/6/.placeholder should be a directory, and the "$GIT_REPO"/6 tree
|
|
|
|
# should only contain one file: the placeholder.
|
|
|
|
test_expect_success 'placeholder namespace conflict with directory' '
|
|
|
|
test -d "$GIT_REPO"/6/.placeholder &&
|
|
|
|
test -f "$GIT_REPO"/6/.placeholder/.placeholder &&
|
|
|
|
test $(find "$GIT_REPO"/6 -type f | wc -l) = "1"
|
|
|
|
'
|
|
|
|
|
|
|
|
# Prepare a second set of svn commits to test persistence during rebase.
|
|
|
|
test_expect_success 'second set of svn commits and rebase' '
|
|
|
|
svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
|
|
|
|
(
|
|
|
|
cd "$SVN_TREE" &&
|
|
|
|
mkdir -p 7 &&
|
|
|
|
echo "This should remove placeholder" > 1/file1.txt &&
|
|
|
|
echo "This should not remove placeholder" > 5/file1.txt &&
|
|
|
|
svn_cmd add 7 1/file1.txt 5/file1.txt &&
|
|
|
|
svn_cmd commit -m "subsequent svn commit for persistence tests"
|
|
|
|
) &&
|
|
|
|
rm -rf "$SVN_TREE" &&
|
|
|
|
(
|
|
|
|
cd "$GIT_REPO" &&
|
|
|
|
git svn rebase
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
# Check that --preserve-empty-dirs and --placeholder-file flag state
|
|
|
|
# stays persistent over multiple invocations.
|
|
|
|
test_expect_success 'flag persistence during subsqeuent rebase' '
|
|
|
|
test -f "$GIT_REPO"/7/.placeholder &&
|
|
|
|
test $(find "$GIT_REPO"/7 -type f | wc -l) = "1"
|
|
|
|
'
|
|
|
|
|
|
|
|
# Check that placeholder files are properly removed when unnecessary,
|
|
|
|
# even across multiple invocations.
|
|
|
|
test_expect_success 'placeholder list persistence during subsqeuent rebase' '
|
|
|
|
test -f "$GIT_REPO"/1/file1.txt &&
|
|
|
|
test $(find "$GIT_REPO"/1 -type f | wc -l) = "1" &&
|
|
|
|
|
|
|
|
test -f "$GIT_REPO"/5/file1.txt &&
|
|
|
|
test -f "$GIT_REPO"/5/.placeholder &&
|
|
|
|
test $(find "$GIT_REPO"/5 -type f | wc -l) = "2"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_done
|