2009-11-09 21:09:56 +01:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='fetch --all works correctly'
|
|
|
|
|
2020-11-19 00:44:32 +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
|
|
|
|
|
2009-11-09 21:09:56 +01:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
setup_repository () {
|
|
|
|
mkdir "$1" && (
|
|
|
|
cd "$1" &&
|
|
|
|
git init &&
|
|
|
|
>file &&
|
|
|
|
git add file &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m "Initial" &&
|
|
|
|
git checkout -b side &&
|
|
|
|
>elif &&
|
|
|
|
git add elif &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m "Second" &&
|
2020-11-19 00:44:32 +01:00
|
|
|
git checkout main
|
2009-11-09 21:09:56 +01:00
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success setup '
|
|
|
|
setup_repository one &&
|
|
|
|
setup_repository two &&
|
|
|
|
(
|
|
|
|
cd two && git branch another
|
|
|
|
) &&
|
2010-10-31 02:46:54 +01:00
|
|
|
git clone --mirror two three &&
|
2009-11-09 21:09:56 +01:00
|
|
|
git clone one test
|
|
|
|
'
|
|
|
|
|
|
|
|
cat > test/expect << EOF
|
2020-11-19 00:44:32 +01:00
|
|
|
one/main
|
2009-11-09 21:09:56 +01:00
|
|
|
one/side
|
2020-11-19 00:44:32 +01:00
|
|
|
origin/HEAD -> origin/main
|
|
|
|
origin/main
|
2009-11-09 21:09:56 +01:00
|
|
|
origin/side
|
|
|
|
three/another
|
2020-11-19 00:44:32 +01:00
|
|
|
three/main
|
2009-11-09 21:09:56 +01:00
|
|
|
three/side
|
|
|
|
two/another
|
2020-11-19 00:44:32 +01:00
|
|
|
two/main
|
2009-11-09 21:09:56 +01:00
|
|
|
two/side
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'git fetch --all' '
|
|
|
|
(cd test &&
|
|
|
|
git remote add one ../one &&
|
|
|
|
git remote add two ../two &&
|
|
|
|
git remote add three ../three &&
|
|
|
|
git fetch --all &&
|
|
|
|
git branch -r > output &&
|
|
|
|
test_cmp expect output)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git fetch --all should continue if a remote has errors' '
|
|
|
|
(git clone one test2 &&
|
|
|
|
cd test2 &&
|
|
|
|
git remote add bad ../non-existing &&
|
|
|
|
git remote add one ../one &&
|
|
|
|
git remote add two ../two &&
|
|
|
|
git remote add three ../three &&
|
|
|
|
test_must_fail git fetch --all &&
|
|
|
|
git branch -r > output &&
|
|
|
|
test_cmp ../test/expect output)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git fetch --all does not allow non-option arguments' '
|
|
|
|
(cd test &&
|
|
|
|
test_must_fail git fetch --all origin &&
|
2020-11-19 00:44:32 +01:00
|
|
|
test_must_fail git fetch --all origin main)
|
2009-11-09 21:09:56 +01:00
|
|
|
'
|
|
|
|
|
2009-11-09 21:10:32 +01:00
|
|
|
cat > expect << EOF
|
2020-11-19 00:44:32 +01:00
|
|
|
origin/HEAD -> origin/main
|
|
|
|
origin/main
|
2009-11-09 21:10:32 +01:00
|
|
|
origin/side
|
|
|
|
three/another
|
2020-11-19 00:44:32 +01:00
|
|
|
three/main
|
2009-11-09 21:10:32 +01:00
|
|
|
three/side
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'git fetch --multiple (but only one remote)' '
|
|
|
|
(git clone one test3 &&
|
|
|
|
cd test3 &&
|
|
|
|
git remote add three ../three &&
|
|
|
|
git fetch --multiple three &&
|
|
|
|
git branch -r > output &&
|
|
|
|
test_cmp ../expect output)
|
|
|
|
'
|
|
|
|
|
|
|
|
cat > expect << EOF
|
2020-11-19 00:44:32 +01:00
|
|
|
one/main
|
2009-11-09 21:10:32 +01:00
|
|
|
one/side
|
|
|
|
two/another
|
2020-11-19 00:44:32 +01:00
|
|
|
two/main
|
2009-11-09 21:10:32 +01:00
|
|
|
two/side
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'git fetch --multiple (two remotes)' '
|
|
|
|
(git clone one test4 &&
|
|
|
|
cd test4 &&
|
2009-11-09 21:11:06 +01:00
|
|
|
git remote rm origin &&
|
2009-11-09 21:10:32 +01:00
|
|
|
git remote add one ../one &&
|
|
|
|
git remote add two ../two &&
|
2019-06-19 11:46:30 +02:00
|
|
|
GIT_TRACE=1 git fetch --multiple one two 2>trace &&
|
2009-11-09 21:10:32 +01:00
|
|
|
git branch -r > output &&
|
2019-06-19 11:46:30 +02:00
|
|
|
test_cmp ../expect output &&
|
2020-09-17 20:11:50 +02:00
|
|
|
grep "built-in: git maintenance" trace >gc &&
|
2019-06-19 11:46:30 +02:00
|
|
|
test_line_count = 1 gc
|
|
|
|
)
|
2009-11-09 21:10:32 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git fetch --multiple (bad remote names)' '
|
|
|
|
(cd test4 &&
|
|
|
|
test_must_fail git fetch --multiple four)
|
|
|
|
'
|
|
|
|
|
2009-11-09 21:11:06 +01:00
|
|
|
|
|
|
|
test_expect_success 'git fetch --all (skipFetchAll)' '
|
|
|
|
(cd test4 &&
|
|
|
|
for b in $(git branch -r)
|
|
|
|
do
|
2015-03-25 06:29:52 +01:00
|
|
|
git branch -r -d $b || exit 1
|
2009-11-09 21:11:06 +01:00
|
|
|
done &&
|
|
|
|
git remote add three ../three &&
|
|
|
|
git config remote.three.skipFetchAll true &&
|
|
|
|
git fetch --all &&
|
|
|
|
git branch -r > output &&
|
|
|
|
test_cmp ../expect output)
|
|
|
|
'
|
|
|
|
|
|
|
|
cat > expect << EOF
|
2020-11-19 00:44:32 +01:00
|
|
|
one/main
|
2009-11-09 21:11:06 +01:00
|
|
|
one/side
|
|
|
|
three/another
|
2020-11-19 00:44:32 +01:00
|
|
|
three/main
|
2009-11-09 21:11:06 +01:00
|
|
|
three/side
|
|
|
|
two/another
|
2020-11-19 00:44:32 +01:00
|
|
|
two/main
|
2009-11-09 21:11:06 +01:00
|
|
|
two/side
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'git fetch --multiple (ignoring skipFetchAll)' '
|
|
|
|
(cd test4 &&
|
|
|
|
for b in $(git branch -r)
|
|
|
|
do
|
2015-03-25 06:29:52 +01:00
|
|
|
git branch -r -d $b || exit 1
|
2009-11-09 21:11:06 +01:00
|
|
|
done &&
|
|
|
|
git fetch --multiple one two three &&
|
|
|
|
git branch -r > output &&
|
|
|
|
test_cmp ../expect output)
|
|
|
|
'
|
|
|
|
|
2012-09-05 23:22:19 +02:00
|
|
|
test_expect_success 'git fetch --all --no-tags' '
|
|
|
|
git clone one test5 &&
|
|
|
|
git clone test5 test6 &&
|
|
|
|
(cd test5 && git tag test-tag) &&
|
|
|
|
(
|
|
|
|
cd test6 &&
|
|
|
|
git fetch --all --no-tags &&
|
|
|
|
git tag >output
|
|
|
|
) &&
|
2018-07-27 19:48:11 +02:00
|
|
|
test_must_be_empty test6/output
|
2012-09-05 23:22:19 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git fetch --all --tags' '
|
|
|
|
echo test-tag >expect &&
|
|
|
|
git clone one test7 &&
|
|
|
|
git clone test7 test8 &&
|
|
|
|
(
|
|
|
|
cd test7 &&
|
|
|
|
test_commit test-tag &&
|
|
|
|
git reset --hard HEAD^
|
|
|
|
) &&
|
|
|
|
(
|
|
|
|
cd test8 &&
|
|
|
|
git fetch --all --tags &&
|
|
|
|
git tag >output
|
|
|
|
) &&
|
|
|
|
test_cmp expect test8/output
|
|
|
|
'
|
|
|
|
|
2019-10-05 20:46:40 +02:00
|
|
|
test_expect_success 'parallel' '
|
|
|
|
git remote add one ./bogus1 &&
|
|
|
|
git remote add two ./bogus2 &&
|
|
|
|
|
|
|
|
test_must_fail env GIT_TRACE="$PWD/trace" \
|
|
|
|
git fetch --jobs=2 --multiple one two 2>err &&
|
|
|
|
grep "preparing to run up to 2 tasks" trace &&
|
|
|
|
test_i18ngrep "could not fetch .one.*128" err &&
|
|
|
|
test_i18ngrep "could not fetch .two.*128" err
|
|
|
|
'
|
|
|
|
|
2009-11-09 21:09:56 +01:00
|
|
|
test_done
|