334afbc76f
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>
238 lines
5.6 KiB
Bash
Executable File
238 lines
5.6 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='test refspec written by clone-command'
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
# Make two branches, "master" and "side"
|
|
echo one >file &&
|
|
git add file &&
|
|
git commit -m one &&
|
|
echo two >file &&
|
|
git commit -a -m two &&
|
|
git tag two &&
|
|
echo three >file &&
|
|
git commit -a -m three &&
|
|
git checkout -b side &&
|
|
echo four >file &&
|
|
git commit -a -m four &&
|
|
git checkout master &&
|
|
git tag five &&
|
|
|
|
# default clone
|
|
git clone . dir_all &&
|
|
|
|
# default clone --no-tags
|
|
git clone --no-tags . dir_all_no_tags &&
|
|
|
|
# default --single that follows HEAD=master
|
|
git clone --single-branch . dir_master &&
|
|
|
|
# default --single that follows HEAD=master with no tags
|
|
git clone --single-branch --no-tags . dir_master_no_tags &&
|
|
|
|
# default --single that follows HEAD=side
|
|
git checkout side &&
|
|
git clone --single-branch . dir_side &&
|
|
|
|
# explicit --single that follows side
|
|
git checkout master &&
|
|
git clone --single-branch --branch side . dir_side2 &&
|
|
|
|
# default --single with --mirror
|
|
git clone --single-branch --mirror . dir_mirror &&
|
|
|
|
# default --single with --branch and --mirror
|
|
git clone --single-branch --mirror --branch side . dir_mirror_side &&
|
|
|
|
# --single that does not know what branch to follow
|
|
git checkout two^ &&
|
|
git clone --single-branch . dir_detached &&
|
|
|
|
# explicit --single with tag
|
|
git clone --single-branch --branch two . dir_tag &&
|
|
|
|
# explicit --single with tag and --no-tags
|
|
git clone --single-branch --no-tags --branch two . dir_tag_no_tags &&
|
|
|
|
# advance both "master" and "side" branches
|
|
git checkout side &&
|
|
echo five >file &&
|
|
git commit -a -m five &&
|
|
git checkout master &&
|
|
echo six >file &&
|
|
git commit -a -m six &&
|
|
|
|
# update tag
|
|
git tag -d two && git tag two
|
|
'
|
|
|
|
test_expect_success 'by default all branches will be kept updated' '
|
|
(
|
|
cd dir_all &&
|
|
git fetch &&
|
|
git for-each-ref refs/remotes/origin >refs &&
|
|
sed -e "/HEAD$/d" \
|
|
-e "s|/remotes/origin/|/heads/|" refs >../actual
|
|
) &&
|
|
# follow both master and side
|
|
git for-each-ref refs/heads >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'by default no tags will be kept updated' '
|
|
(
|
|
cd dir_all &&
|
|
git fetch &&
|
|
git for-each-ref refs/tags >../actual
|
|
) &&
|
|
git for-each-ref refs/tags >expect &&
|
|
! test_cmp expect actual &&
|
|
test_line_count = 2 actual
|
|
'
|
|
|
|
test_expect_success 'clone with --no-tags' '
|
|
(
|
|
cd dir_all_no_tags &&
|
|
git fetch &&
|
|
git for-each-ref refs/tags >../actual
|
|
) &&
|
|
test_must_be_empty actual
|
|
'
|
|
|
|
test_expect_success '--single-branch while HEAD pointing at master' '
|
|
(
|
|
cd dir_master &&
|
|
git fetch --force &&
|
|
git for-each-ref refs/remotes/origin >refs &&
|
|
sed -e "/HEAD$/d" \
|
|
-e "s|/remotes/origin/|/heads/|" refs >../actual
|
|
) &&
|
|
# only follow master
|
|
git for-each-ref refs/heads/master >expect &&
|
|
# get & check latest tags
|
|
test_cmp expect actual &&
|
|
(
|
|
cd dir_master &&
|
|
git fetch --tags --force &&
|
|
git for-each-ref refs/tags >../actual
|
|
) &&
|
|
git for-each-ref refs/tags >expect &&
|
|
test_cmp expect actual &&
|
|
test_line_count = 2 actual
|
|
'
|
|
|
|
test_expect_success '--single-branch while HEAD pointing at master and --no-tags' '
|
|
(
|
|
cd dir_master_no_tags &&
|
|
git fetch &&
|
|
git for-each-ref refs/remotes/origin >refs &&
|
|
sed -e "/HEAD$/d" \
|
|
-e "s|/remotes/origin/|/heads/|" refs >../actual
|
|
) &&
|
|
# only follow master
|
|
git for-each-ref refs/heads/master >expect &&
|
|
test_cmp expect actual &&
|
|
# get tags (noop)
|
|
(
|
|
cd dir_master_no_tags &&
|
|
git fetch &&
|
|
git for-each-ref refs/tags >../actual
|
|
) &&
|
|
test_must_be_empty actual &&
|
|
test_line_count = 0 actual &&
|
|
# get tags with --tags overrides tagOpt
|
|
(
|
|
cd dir_master_no_tags &&
|
|
git fetch --tags &&
|
|
git for-each-ref refs/tags >../actual
|
|
) &&
|
|
git for-each-ref refs/tags >expect &&
|
|
test_cmp expect actual &&
|
|
test_line_count = 2 actual
|
|
'
|
|
|
|
test_expect_success '--single-branch while HEAD pointing at side' '
|
|
(
|
|
cd dir_side &&
|
|
git fetch &&
|
|
git for-each-ref refs/remotes/origin >refs &&
|
|
sed -e "/HEAD$/d" \
|
|
-e "s|/remotes/origin/|/heads/|" refs >../actual
|
|
) &&
|
|
# only follow side
|
|
git for-each-ref refs/heads/side >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '--single-branch with explicit --branch side' '
|
|
(
|
|
cd dir_side2 &&
|
|
git fetch &&
|
|
git for-each-ref refs/remotes/origin >refs &&
|
|
sed -e "/HEAD$/d" \
|
|
-e "s|/remotes/origin/|/heads/|" refs >../actual
|
|
) &&
|
|
# only follow side
|
|
git for-each-ref refs/heads/side >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '--single-branch with explicit --branch with tag fetches updated tag' '
|
|
(
|
|
cd dir_tag &&
|
|
git fetch &&
|
|
git for-each-ref refs/tags >../actual
|
|
) &&
|
|
git for-each-ref refs/tags >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '--single-branch with explicit --branch with tag fetches updated tag despite --no-tags' '
|
|
(
|
|
cd dir_tag_no_tags &&
|
|
git fetch &&
|
|
git for-each-ref refs/tags >../actual
|
|
) &&
|
|
git for-each-ref refs/tags/two >expect &&
|
|
test_cmp expect actual &&
|
|
test_line_count = 1 actual
|
|
'
|
|
|
|
test_expect_success '--single-branch with --mirror' '
|
|
(
|
|
cd dir_mirror &&
|
|
git fetch &&
|
|
git for-each-ref refs > ../actual
|
|
) &&
|
|
git for-each-ref refs >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '--single-branch with explicit --branch and --mirror' '
|
|
(
|
|
cd dir_mirror_side &&
|
|
git fetch &&
|
|
git for-each-ref refs > ../actual
|
|
) &&
|
|
git for-each-ref refs >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '--single-branch with detached' '
|
|
(
|
|
cd dir_detached &&
|
|
git fetch &&
|
|
git for-each-ref refs/remotes/origin >refs &&
|
|
sed -e "/HEAD$/d" \
|
|
-e "s|/remotes/origin/|/heads/|" refs >../actual
|
|
) &&
|
|
# nothing
|
|
test_must_be_empty actual
|
|
'
|
|
|
|
test_done
|