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>
75 lines
1.9 KiB
Bash
Executable File
75 lines
1.9 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (C) 2020 Shourya Shukla
|
|
#
|
|
|
|
test_description='Summary support for submodules, adding them using git submodule add
|
|
|
|
This test script tries to verify the sanity of summary subcommand of git submodule
|
|
while making sure to add submodules using `git submodule add` instead of
|
|
`git add` as done in t7401.
|
|
'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
git config --global protocol.file.allow always
|
|
'
|
|
|
|
test_expect_success 'summary test environment setup' '
|
|
git init sm &&
|
|
test_commit -C sm "add file" file file-content file-tag &&
|
|
|
|
git submodule add ./sm my-subm &&
|
|
test_tick &&
|
|
git commit -m "add submodule"
|
|
'
|
|
|
|
test_expect_success 'submodule summary output for initialized submodule' '
|
|
test_commit -C sm "add file2" file2 file2-content file2-tag &&
|
|
git submodule update --remote &&
|
|
test_tick &&
|
|
git commit -m "update submodule" my-subm &&
|
|
git submodule summary HEAD^ >actual &&
|
|
rev1=$(git -C sm rev-parse --short HEAD^) &&
|
|
rev2=$(git -C sm rev-parse --short HEAD) &&
|
|
cat >expected <<-EOF &&
|
|
* my-subm ${rev1}...${rev2} (1):
|
|
> add file2
|
|
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'submodule summary output for deinitialized submodule' '
|
|
git submodule deinit my-subm &&
|
|
git submodule summary HEAD^ >actual &&
|
|
test_must_be_empty actual &&
|
|
git submodule update --init my-subm &&
|
|
git submodule summary HEAD^ >actual &&
|
|
rev1=$(git -C sm rev-parse --short HEAD^) &&
|
|
rev2=$(git -C sm rev-parse --short HEAD) &&
|
|
cat >expected <<-EOF &&
|
|
* my-subm ${rev1}...${rev2} (1):
|
|
> add file2
|
|
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'submodule summary output for submodules with changed paths' '
|
|
git mv my-subm subm &&
|
|
git commit -m "change submodule path" &&
|
|
rev=$(git -C sm rev-parse --short HEAD^) &&
|
|
git submodule summary HEAD^^ -- my-subm >actual 2>err &&
|
|
test_must_be_empty err &&
|
|
cat >expected <<-EOF &&
|
|
* my-subm ${rev}...0000000:
|
|
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_done
|