2008-10-02 11:11:55 +02:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2008 David Aguilar
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='git submodule sync
|
|
|
|
|
|
|
|
These tests exercise the "git submodule sync" subcommand.
|
|
|
|
'
|
|
|
|
|
2020-11-19 00:44:39 +01:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-19 00:44:19 +01:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
2008-10-02 11:11:55 +02:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success setup '
|
2013-06-16 16:18:14 +02:00
|
|
|
echo file >file &&
|
2008-10-02 11:11:55 +02:00
|
|
|
git add file &&
|
|
|
|
test_tick &&
|
2010-08-18 23:20:33 +02:00
|
|
|
git commit -m upstream &&
|
2008-10-02 11:11:55 +02:00
|
|
|
git clone . super &&
|
|
|
|
git clone super submodule &&
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd submodule &&
|
|
|
|
git submodule add ../submodule sub-submodule &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m "sub-submodule"
|
2012-10-26 21:44:43 +02:00
|
|
|
) &&
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd super &&
|
|
|
|
git submodule add ../submodule submodule &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m "submodule"
|
2008-10-02 11:11:55 +02:00
|
|
|
) &&
|
|
|
|
git clone super super-clone &&
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd super-clone &&
|
|
|
|
git submodule update --init --recursive
|
|
|
|
) &&
|
2010-10-08 03:07:48 +02:00
|
|
|
git clone super empty-clone &&
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd empty-clone &&
|
|
|
|
git submodule init
|
|
|
|
) &&
|
2012-06-03 11:46:48 +02:00
|
|
|
git clone super top-only-clone &&
|
|
|
|
git clone super relative-clone &&
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd relative-clone &&
|
|
|
|
git submodule update --init --recursive
|
|
|
|
) &&
|
2012-10-26 21:44:43 +02:00
|
|
|
git clone super recursive-clone &&
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd recursive-clone &&
|
|
|
|
git submodule update --init --recursive
|
|
|
|
)
|
2008-10-02 11:11:55 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'change submodule' '
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd submodule &&
|
|
|
|
echo second line >>file &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -a -m "change submodule"
|
2008-10-02 11:11:55 +02:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2013-06-16 16:18:18 +02:00
|
|
|
reset_submodule_urls () {
|
|
|
|
(
|
2016-06-01 22:56:08 +02:00
|
|
|
root=$(pwd) &&
|
2013-06-16 16:18:18 +02:00
|
|
|
cd super-clone/submodule &&
|
|
|
|
git config remote.origin.url "$root/submodule"
|
|
|
|
) &&
|
|
|
|
(
|
2016-06-01 22:56:08 +02:00
|
|
|
root=$(pwd) &&
|
2013-06-16 16:18:18 +02:00
|
|
|
cd super-clone/submodule/sub-submodule &&
|
|
|
|
git config remote.origin.url "$root/submodule"
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
2008-10-02 11:11:55 +02:00
|
|
|
test_expect_success 'change submodule url' '
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd super &&
|
|
|
|
cd submodule &&
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main &&
|
2013-06-16 16:18:14 +02:00
|
|
|
git pull
|
2008-10-02 11:11:55 +02:00
|
|
|
) &&
|
|
|
|
mv submodule moved-submodule &&
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd moved-submodule &&
|
|
|
|
git config -f .gitmodules submodule.sub-submodule.url ../moved-submodule &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -a -m moved-sub-submodule
|
2012-10-26 21:44:43 +02:00
|
|
|
) &&
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd super &&
|
|
|
|
git config -f .gitmodules submodule.submodule.url ../moved-submodule &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -a -m moved-submodule
|
2008-10-02 11:11:55 +02:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '"git submodule sync" should update submodule URLs' '
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd super-clone &&
|
|
|
|
git pull --no-recurse-submodules &&
|
|
|
|
git submodule sync
|
2008-10-02 11:11:55 +02:00
|
|
|
) &&
|
2013-06-16 16:18:14 +02:00
|
|
|
test -d "$(
|
|
|
|
cd super-clone/submodule &&
|
|
|
|
git config remote.origin.url
|
2011-08-15 23:17:46 +02:00
|
|
|
)" &&
|
2013-06-16 16:18:14 +02:00
|
|
|
test ! -d "$(
|
|
|
|
cd super-clone/submodule/sub-submodule &&
|
|
|
|
git config remote.origin.url
|
2012-10-26 21:44:43 +02:00
|
|
|
)" &&
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd super-clone/submodule &&
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main &&
|
2013-06-16 16:18:14 +02:00
|
|
|
git pull
|
2010-08-18 17:58:33 +02:00
|
|
|
) &&
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd super-clone &&
|
|
|
|
test -d "$(git config submodule.submodule.url)"
|
2008-10-02 11:11:55 +02:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-10-26 21:44:43 +02:00
|
|
|
test_expect_success '"git submodule sync --recursive" should update all submodule URLs' '
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd super-clone &&
|
|
|
|
(
|
|
|
|
cd submodule &&
|
|
|
|
git pull --no-recurse-submodules
|
|
|
|
) &&
|
|
|
|
git submodule sync --recursive
|
2012-10-26 21:44:43 +02:00
|
|
|
) &&
|
2013-06-16 16:18:14 +02:00
|
|
|
test -d "$(
|
|
|
|
cd super-clone/submodule &&
|
|
|
|
git config remote.origin.url
|
2012-10-26 21:44:43 +02:00
|
|
|
)" &&
|
2013-06-16 16:18:14 +02:00
|
|
|
test -d "$(
|
|
|
|
cd super-clone/submodule/sub-submodule &&
|
|
|
|
git config remote.origin.url
|
2012-10-26 21:44:43 +02:00
|
|
|
)" &&
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd super-clone/submodule/sub-submodule &&
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main &&
|
2013-06-16 16:18:14 +02:00
|
|
|
git pull
|
2012-10-26 21:44:43 +02:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2013-06-16 16:18:18 +02:00
|
|
|
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
|
|
|
|
) &&
|
2016-06-17 22:21:07 +02:00
|
|
|
test_i18ngrep "\\.\\./submodule" output &&
|
2013-06-16 16:18:18 +02:00
|
|
|
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 &&
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main &&
|
2013-06-16 16:18:18 +02:00
|
|
|
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
|
|
|
|
) &&
|
2016-06-17 22:21:07 +02:00
|
|
|
test_i18ngrep "\\.\\./submodule/sub-submodule" output &&
|
2013-06-16 16:18:18 +02:00
|
|
|
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 &&
|
2020-11-19 00:44:39 +01:00
|
|
|
git checkout main &&
|
2013-06-16 16:18:18 +02:00
|
|
|
git pull
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2011-06-25 22:41:25 +02:00
|
|
|
test_expect_success '"git submodule sync" should update known submodule URLs' '
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd empty-clone &&
|
|
|
|
git pull &&
|
|
|
|
git submodule sync &&
|
|
|
|
test -d "$(git config submodule.submodule.url)"
|
2010-10-08 03:07:48 +02:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2011-06-25 22:41:25 +02:00
|
|
|
test_expect_success '"git submodule sync" should not vivify uninteresting submodule' '
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
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)"
|
2011-06-25 22:41:25 +02:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-06-06 13:57:30 +02:00
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form foo' '
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
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"
|
|
|
|
)
|
2012-06-03 11:46:48 +02:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-06-06 13:57:29 +02:00
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form foo/bar' '
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
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"
|
2013-06-16 16:18:15 +02:00
|
|
|
) &&
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd submodule/sub-submodule &&
|
|
|
|
test "$(git config remote.origin.url)" != "../../foo/submodule"
|
|
|
|
)
|
2012-10-26 21:44:43 +02:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '"git submodule sync --recursive" propagates changes in origin' '
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
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"
|
2013-06-16 16:18:15 +02:00
|
|
|
) &&
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd submodule/sub-submodule &&
|
|
|
|
test "$(git config remote.origin.url)" = "../../foo/submodule"
|
|
|
|
)
|
2012-06-03 11:46:48 +02:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-06-06 13:57:30 +02:00
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ./foo' '
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd relative-clone &&
|
|
|
|
git remote set-url origin ./foo &&
|
|
|
|
git submodule sync &&
|
|
|
|
(
|
|
|
|
cd submodule &&
|
|
|
|
#actual ./submodule
|
|
|
|
test "$(git config remote.origin.url)" = "../submodule"
|
|
|
|
)
|
2012-06-03 11:46:48 +02:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-06-06 13:57:30 +02:00
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ./foo/bar' '
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
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"
|
|
|
|
)
|
2012-06-03 11:46:48 +02:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-06-06 13:57:29 +02:00
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ../foo' '
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
cd relative-clone &&
|
|
|
|
git remote set-url origin ../foo &&
|
|
|
|
git submodule sync &&
|
|
|
|
(
|
|
|
|
cd submodule &&
|
|
|
|
#actual ../submodule
|
|
|
|
test "$(git config remote.origin.url)" = "../../submodule"
|
|
|
|
)
|
2012-06-03 11:46:48 +02:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-06-06 13:57:29 +02:00
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ../foo/bar' '
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
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"
|
|
|
|
)
|
2012-06-03 11:46:48 +02:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-06-06 13:57:29 +02:00
|
|
|
test_expect_success '"git submodule sync" handles origin URL of the form ../foo/bar with deeply nested submodule' '
|
2013-06-16 16:18:14 +02:00
|
|
|
(
|
|
|
|
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"
|
|
|
|
)
|
2012-06-03 11:46:48 +02:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
|
2008-10-02 11:11:55 +02:00
|
|
|
test_done
|