mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
![Ævar Arnfjörð Bjarmason](/assets/img/avatar_default.png)
When the "ab/various-leak-fixes" topic was merged in [1] only t6021 would fail if the tests were run in the "GIT_TEST_PASSING_SANITIZE_LEAK=check" mode, i.e. to check whether we marked all leak-free tests with "TEST_PASSES_SANITIZE_LEAK=true". Since then we've had various tests starting to pass under SANITIZE=leak. Let's mark those as passing, this is when they started to pass, narrowed down with "git bisect": - t5317-pack-objects-filter-objects.sh: Infaebba436e
(list-objects-filter: plug pattern_list leak, 2022-12-01). - t3210-pack-refs.sh, t5613-info-alternate.sh, t7403-submodule-sync.sh: In189e97bc4b
(diff: remove parseopts member from struct diff_options, 2022-12-01). - t1408-packed-refs.sh: Inab91f6b7c4
(Merge branch 'rs/diff-parseopts', 2022-12-19). - t0023-crlf-am.sh, t4152-am-subjects.sh, t4254-am-corrupt.sh, t4256-am-format-flowed.sh, t4257-am-interactive.sh, t5403-post-checkout-hook.sh: Ina658e881c1
(am: don't pass strvec to apply_parse_options(), 2022-12-13) - t1301-shared-repo.sh, t1302-repo-version.sh: Inb07a819c05
(reflog: clear leftovers in reflog_expiry_cleanup(), 2022-12-13). - t1304-default-acl.sh, t1410-reflog.sh, t5330-no-lazy-fetch-with-commit-graph.sh, t5502-quickfetch.sh, t5604-clone-reference.sh, t6014-rev-list-all.sh, t7701-repack-unpack-unreachable.sh: Inb0c61be320
(Merge branch 'rs/reflog-expiry-cleanup', 2022-12-26) - t3800-mktag.sh, t5302-pack-index.sh, t5306-pack-nobase.sh, t5573-pull-verify-signatures.sh, t7612-merge-verify-signatures.sh: In69bbbe484b
(hash-object: use fsck for object checks, 2023-01-18). - t1451-fsck-buffer.sh: In8e4309038f
(fsck: do not assume NUL-termination of buffers, 2023-01-19). - t6501-freshen-objects.sh: Inabf2bb895b
(Merge branch 'jk/hash-object-fsck', 2023-01-30) 1.9ea1378d04
(Merge branch 'ab/various-leak-fixes', 2022-12-14) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
357 lines
7.5 KiB
Bash
Executable file
357 lines
7.5 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2008 David Aguilar
|
|
#
|
|
|
|
test_description='git submodule sync
|
|
|
|
These tests exercise the "git submodule sync" subcommand.
|
|
'
|
|
|
|
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 &&
|
|
|
|
echo file >file &&
|
|
git add file &&
|
|
test_tick &&
|
|
git commit -m upstream &&
|
|
git clone . super &&
|
|
git clone super submodule &&
|
|
(
|
|
cd submodule &&
|
|
git submodule add ../submodule sub-submodule &&
|
|
test_tick &&
|
|
git commit -m "sub-submodule"
|
|
) &&
|
|
(
|
|
cd super &&
|
|
git submodule add ../submodule submodule &&
|
|
test_tick &&
|
|
git commit -m "submodule"
|
|
) &&
|
|
git clone super super-clone &&
|
|
(
|
|
cd super-clone &&
|
|
git submodule update --init --recursive
|
|
) &&
|
|
git clone super empty-clone &&
|
|
(
|
|
cd empty-clone &&
|
|
git submodule init
|
|
) &&
|
|
git clone super top-only-clone &&
|
|
git clone super relative-clone &&
|
|
(
|
|
cd relative-clone &&
|
|
git submodule update --init --recursive
|
|
) &&
|
|
git clone super recursive-clone &&
|
|
(
|
|
cd recursive-clone &&
|
|
git submodule update --init --recursive
|
|
)
|
|
'
|
|
|
|
test_expect_success 'change submodule' '
|
|
(
|
|
cd submodule &&
|
|
echo second line >>file &&
|
|
test_tick &&
|
|
git commit -a -m "change submodule"
|
|
)
|
|
'
|
|
|
|
reset_submodule_urls () {
|
|
(
|
|
root=$(pwd) &&
|
|
cd super-clone/submodule &&
|
|
git config remote.origin.url "$root/submodule"
|
|
) &&
|
|
(
|
|
root=$(pwd) &&
|
|
cd super-clone/submodule/sub-submodule &&
|
|
git config remote.origin.url "$root/submodule"
|
|
)
|
|
}
|
|
|
|
test_expect_success 'change submodule url' '
|
|
(
|
|
cd super &&
|
|
cd submodule &&
|
|
git checkout main &&
|
|
git pull
|
|
) &&
|
|
mv submodule moved-submodule &&
|
|
(
|
|
cd moved-submodule &&
|
|
git config -f .gitmodules submodule.sub-submodule.url ../moved-submodule &&
|
|
test_tick &&
|
|
git commit -a -m moved-sub-submodule
|
|
) &&
|
|
(
|
|
cd super &&
|
|
git config -f .gitmodules submodule.submodule.url ../moved-submodule &&
|
|
test_tick &&
|
|
git commit -a -m moved-submodule
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" should update submodule URLs' '
|
|
(
|
|
cd super-clone &&
|
|
git pull --no-recurse-submodules &&
|
|
git submodule sync
|
|
) &&
|
|
test -d "$(
|
|
cd super-clone/submodule &&
|
|
git config remote.origin.url
|
|
)" &&
|
|
test ! -d "$(
|
|
cd super-clone/submodule/sub-submodule &&
|
|
git config remote.origin.url
|
|
)" &&
|
|
(
|
|
cd super-clone/submodule &&
|
|
git checkout main &&
|
|
git pull
|
|
) &&
|
|
(
|
|
cd super-clone &&
|
|
test -d "$(git config submodule.submodule.url)"
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync --recursive" should update all submodule URLs' '
|
|
(
|
|
cd super-clone &&
|
|
(
|
|
cd submodule &&
|
|
git pull --no-recurse-submodules
|
|
) &&
|
|
git submodule sync --recursive
|
|
) &&
|
|
test -d "$(
|
|
cd super-clone/submodule &&
|
|
git config remote.origin.url
|
|
)" &&
|
|
test -d "$(
|
|
cd super-clone/submodule/sub-submodule &&
|
|
git config remote.origin.url
|
|
)" &&
|
|
(
|
|
cd super-clone/submodule/sub-submodule &&
|
|
git checkout main &&
|
|
git pull
|
|
)
|
|
'
|
|
|
|
test_expect_success 'reset submodule URLs' '
|
|
reset_submodule_urls super-clone
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" should update submodule URLs - subdirectory' '
|
|
(
|
|
cd super-clone &&
|
|
git pull --no-recurse-submodules &&
|
|
mkdir -p sub &&
|
|
cd sub &&
|
|
git submodule sync >../../output
|
|
) &&
|
|
test_i18ngrep "\\.\\./submodule" output &&
|
|
test -d "$(
|
|
cd super-clone/submodule &&
|
|
git config remote.origin.url
|
|
)" &&
|
|
test ! -d "$(
|
|
cd super-clone/submodule/sub-submodule &&
|
|
git config remote.origin.url
|
|
)" &&
|
|
(
|
|
cd super-clone/submodule &&
|
|
git checkout main &&
|
|
git pull
|
|
) &&
|
|
(
|
|
cd super-clone &&
|
|
test -d "$(git config submodule.submodule.url)"
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync --recursive" should update all submodule URLs - subdirectory' '
|
|
(
|
|
cd super-clone &&
|
|
(
|
|
cd submodule &&
|
|
git pull --no-recurse-submodules
|
|
) &&
|
|
mkdir -p sub &&
|
|
cd sub &&
|
|
git submodule sync --recursive >../../output
|
|
) &&
|
|
test_i18ngrep "\\.\\./submodule/sub-submodule" output &&
|
|
test -d "$(
|
|
cd super-clone/submodule &&
|
|
git config remote.origin.url
|
|
)" &&
|
|
test -d "$(
|
|
cd super-clone/submodule/sub-submodule &&
|
|
git config remote.origin.url
|
|
)" &&
|
|
(
|
|
cd super-clone/submodule/sub-submodule &&
|
|
git checkout main &&
|
|
git pull
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" should update known submodule URLs' '
|
|
(
|
|
cd empty-clone &&
|
|
git pull &&
|
|
git submodule sync &&
|
|
test -d "$(git config submodule.submodule.url)"
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" should not vivify uninteresting submodule' '
|
|
(
|
|
cd top-only-clone &&
|
|
git pull &&
|
|
git submodule sync &&
|
|
test -z "$(git config submodule.submodule.url)" &&
|
|
git submodule sync submodule &&
|
|
test -z "$(git config submodule.submodule.url)"
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form foo' '
|
|
(
|
|
cd relative-clone &&
|
|
git remote set-url origin foo &&
|
|
git submodule sync &&
|
|
(
|
|
cd submodule &&
|
|
#actual fails with: "cannot strip off url foo
|
|
test "$(git config remote.origin.url)" = "../submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form foo/bar' '
|
|
(
|
|
cd relative-clone &&
|
|
git remote set-url origin foo/bar &&
|
|
git submodule sync &&
|
|
(
|
|
cd submodule &&
|
|
#actual foo/submodule
|
|
test "$(git config remote.origin.url)" = "../foo/submodule"
|
|
) &&
|
|
(
|
|
cd submodule/sub-submodule &&
|
|
test "$(git config remote.origin.url)" != "../../foo/submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync --recursive" propagates changes in origin' '
|
|
(
|
|
cd recursive-clone &&
|
|
git remote set-url origin foo/bar &&
|
|
git submodule sync --recursive &&
|
|
(
|
|
cd submodule &&
|
|
#actual foo/submodule
|
|
test "$(git config remote.origin.url)" = "../foo/submodule"
|
|
) &&
|
|
(
|
|
cd submodule/sub-submodule &&
|
|
test "$(git config remote.origin.url)" = "../../foo/submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ./foo' '
|
|
(
|
|
cd relative-clone &&
|
|
git remote set-url origin ./foo &&
|
|
git submodule sync &&
|
|
(
|
|
cd submodule &&
|
|
#actual ./submodule
|
|
test "$(git config remote.origin.url)" = "../submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ./foo/bar' '
|
|
(
|
|
cd relative-clone &&
|
|
git remote set-url origin ./foo/bar &&
|
|
git submodule sync &&
|
|
(
|
|
cd submodule &&
|
|
#actual ./foo/submodule
|
|
test "$(git config remote.origin.url)" = "../foo/submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ../foo' '
|
|
(
|
|
cd relative-clone &&
|
|
git remote set-url origin ../foo &&
|
|
git submodule sync &&
|
|
(
|
|
cd submodule &&
|
|
#actual ../submodule
|
|
test "$(git config remote.origin.url)" = "../../submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ../foo/bar' '
|
|
(
|
|
cd relative-clone &&
|
|
git remote set-url origin ../foo/bar &&
|
|
git submodule sync &&
|
|
(
|
|
cd submodule &&
|
|
#actual ../foo/submodule
|
|
test "$(git config remote.origin.url)" = "../../foo/submodule"
|
|
)
|
|
)
|
|
'
|
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ../foo/bar with deeply nested submodule' '
|
|
(
|
|
cd relative-clone &&
|
|
git remote set-url origin ../foo/bar &&
|
|
mkdir -p a/b/c &&
|
|
(
|
|
cd a/b/c &&
|
|
git init &&
|
|
>.gitignore &&
|
|
git add .gitignore &&
|
|
test_tick &&
|
|
git commit -m "initial commit"
|
|
) &&
|
|
git submodule add ../bar/a/b/c ./a/b/c &&
|
|
git submodule sync &&
|
|
(
|
|
cd a/b/c &&
|
|
#actual ../foo/bar/a/b/c
|
|
test "$(git config remote.origin.url)" = "../../../../foo/bar/a/b/c"
|
|
)
|
|
)
|
|
'
|
|
|
|
|
|
test_done
|