ebdbefa4fe
Similar to the preceding commit, we have effectively given tracking memory ownership of submodule gitfile paths. Refactor the code to start tracking allocated strings in a separate `struct strvec` such that we can easily plug those leaks. Mark now-passing tests as leak free. Note that ideally, we wouldn't require two separate data structures to track those paths. But we do need to store `NULL` pointers for the gitfile paths such that we can indicate that its corresponding entries in the other arrays do not have such a path at all. And given that `struct strvec`s cannot store `NULL` pointers we cannot use them to store this information. There is another small gotcha that is easy to miss: you may be wondering why we don't want to store `SUBMODULE_WITH_GITDIR` in the strvec. This is because this is a mere sentinel value and not actually a string at all. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
54 lines
1.5 KiB
Bash
Executable File
54 lines
1.5 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='check handling of .gitmodule path with dash'
|
|
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' '
|
|
git config --global protocol.file.allow always
|
|
'
|
|
|
|
test_expect_success 'create submodule with dash in path' '
|
|
git init upstream &&
|
|
git -C upstream commit --allow-empty -m base &&
|
|
git submodule add ./upstream sub &&
|
|
git mv sub ./-sub &&
|
|
git commit -m submodule
|
|
'
|
|
|
|
test_expect_success 'clone rejects unprotected dash' '
|
|
test_when_finished "rm -rf dst" &&
|
|
git clone --recurse-submodules . dst 2>err &&
|
|
test_grep ignoring err
|
|
'
|
|
|
|
test_expect_success 'fsck rejects unprotected dash' '
|
|
test_when_finished "rm -rf dst" &&
|
|
git init --bare dst &&
|
|
git -C dst config transfer.fsckObjects true &&
|
|
test_must_fail git push dst HEAD 2>err &&
|
|
grep gitmodulesPath err
|
|
'
|
|
|
|
test_expect_success MINGW 'submodule paths disallows trailing spaces' '
|
|
git init super &&
|
|
test_must_fail git -C super submodule add ../upstream "sub " &&
|
|
|
|
: add "sub", then rename "sub" to "sub ", the hard way &&
|
|
git -C super submodule add ../upstream sub &&
|
|
tree=$(git -C super write-tree) &&
|
|
git -C super ls-tree $tree >tree &&
|
|
sed "s/sub/sub /" <tree >tree.new &&
|
|
tree=$(git -C super mktree <tree.new) &&
|
|
commit=$(echo with space | git -C super commit-tree $tree) &&
|
|
git -C super update-ref refs/heads/main $commit &&
|
|
|
|
test_must_fail git clone --recurse-submodules super dst 2>err &&
|
|
test_grep "sub " err
|
|
'
|
|
|
|
test_done
|