mirror of
https://github.com/git/git.git
synced 2024-09-28 20:51:42 +02:00
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>
135 lines
4.0 KiB
Bash
Executable File
135 lines
4.0 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='basic clone options'
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
mkdir parent &&
|
|
(cd parent && git init &&
|
|
echo one >file && git add file &&
|
|
git commit -m one)
|
|
|
|
'
|
|
|
|
test_expect_success 'clone -o' '
|
|
|
|
git clone -o foo parent clone-o &&
|
|
git -C clone-o rev-parse --verify refs/remotes/foo/master
|
|
|
|
'
|
|
|
|
test_expect_success 'rejects invalid -o/--origin' '
|
|
|
|
test_must_fail git clone -o "bad...name" parent clone-bad-name 2>err &&
|
|
test_i18ngrep "'\''bad...name'\'' is not a valid remote name" err
|
|
|
|
'
|
|
|
|
test_expect_success 'disallows --bare with --origin' '
|
|
|
|
test_must_fail git clone -o foo --bare parent clone-bare-o 2>err &&
|
|
test_debug "cat err" &&
|
|
test_i18ngrep -e "--bare and --origin foo options are incompatible" err
|
|
|
|
'
|
|
|
|
test_expect_success 'disallows --bare with --separate-git-dir' '
|
|
|
|
test_must_fail git clone --bare --separate-git-dir dot-git-destiation parent clone-bare-sgd 2>err &&
|
|
test_debug "cat err" &&
|
|
test_i18ngrep -e "--bare and --separate-git-dir are incompatible" err
|
|
|
|
'
|
|
|
|
test_expect_success 'uses "origin" for default remote name' '
|
|
|
|
git clone parent clone-default-origin &&
|
|
git -C clone-default-origin rev-parse --verify refs/remotes/origin/master
|
|
|
|
'
|
|
|
|
test_expect_success 'prefers --template config over normal config' '
|
|
|
|
template="$TRASH_DIRECTORY/template-with-config" &&
|
|
mkdir "$template" &&
|
|
git config --file "$template/config" foo.bar from_template &&
|
|
test_config_global foo.bar from_global &&
|
|
git clone "--template=$template" parent clone-template-config &&
|
|
test "$(git -C clone-template-config config --local foo.bar)" = "from_template"
|
|
|
|
'
|
|
|
|
test_expect_success 'prefers -c config over --template config' '
|
|
|
|
template="$TRASH_DIRECTORY/template-with-ignored-config" &&
|
|
mkdir "$template" &&
|
|
git config --file "$template/config" foo.bar from_template &&
|
|
git clone "--template=$template" -c foo.bar=inline parent clone-template-inline-config &&
|
|
test "$(git -C clone-template-inline-config config --local foo.bar)" = "inline"
|
|
|
|
'
|
|
|
|
test_expect_success 'prefers config "clone.defaultRemoteName" over default' '
|
|
|
|
test_config_global clone.defaultRemoteName from_config &&
|
|
git clone parent clone-config-origin &&
|
|
git -C clone-config-origin rev-parse --verify refs/remotes/from_config/master
|
|
|
|
'
|
|
|
|
test_expect_success 'prefers --origin over -c config' '
|
|
|
|
git clone -c clone.defaultRemoteName=inline --origin from_option parent clone-o-and-inline-config &&
|
|
git -C clone-o-and-inline-config rev-parse --verify refs/remotes/from_option/master
|
|
|
|
'
|
|
|
|
test_expect_success 'redirected clone does not show progress' '
|
|
|
|
git clone "file://$(pwd)/parent" clone-redirected >out 2>err &&
|
|
! grep % err &&
|
|
test_i18ngrep ! "Checking connectivity" err
|
|
|
|
'
|
|
|
|
test_expect_success 'redirected clone -v does show progress' '
|
|
|
|
git clone --progress "file://$(pwd)/parent" clone-redirected-progress \
|
|
>out 2>err &&
|
|
grep % err
|
|
|
|
'
|
|
|
|
test_expect_success 'chooses correct default initial branch name' '
|
|
git init --bare empty &&
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
|
|
git -c init.defaultBranch=up clone empty whats-up &&
|
|
test refs/heads/up = $(git -C whats-up symbolic-ref HEAD) &&
|
|
test refs/heads/up = $(git -C whats-up config branch.up.merge)
|
|
'
|
|
|
|
test_expect_success 'guesses initial branch name correctly' '
|
|
git init --initial-branch=guess initial-branch &&
|
|
test_commit -C initial-branch no-spoilers &&
|
|
git -C initial-branch branch abc guess &&
|
|
git clone initial-branch is-it &&
|
|
test refs/heads/guess = $(git -C is-it symbolic-ref HEAD) &&
|
|
|
|
git -c init.defaultBranch=none init --bare no-head &&
|
|
git -C initial-branch push ../no-head guess abc &&
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
|
|
git clone no-head is-it2 &&
|
|
test_must_fail git -C is-it2 symbolic-ref refs/remotes/origin/HEAD &&
|
|
git -C no-head update-ref --no-deref HEAD refs/heads/guess &&
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
|
|
git -c init.defaultBranch=guess clone no-head is-it3 &&
|
|
test refs/remotes/origin/guess = \
|
|
$(git -C is-it3 symbolic-ref refs/remotes/origin/HEAD)
|
|
'
|
|
|
|
test_done
|