mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00: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>
112 lines
3.1 KiB
Bash
Executable file
112 lines
3.1 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='tests for git clone -c key=value'
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'clone -c sets config in cloned repo' '
|
|
rm -rf child &&
|
|
git clone -c core.foo=bar . child &&
|
|
echo bar >expect &&
|
|
git --git-dir=child/.git config core.foo >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'clone -c can set multi-keys' '
|
|
rm -rf child &&
|
|
git clone -c core.foo=bar -c core.foo=baz . child &&
|
|
{ echo bar; echo baz; } >expect &&
|
|
git --git-dir=child/.git config --get-all core.foo >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'clone -c can set multi-keys, including some empty' '
|
|
rm -rf child &&
|
|
git clone -c credential.helper= -c credential.helper=hi . child &&
|
|
printf "%s\n" "" hi >expect &&
|
|
git --git-dir=child/.git config --get-all credential.helper >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'clone -c without a value is boolean true' '
|
|
rm -rf child &&
|
|
git clone -c core.foo . child &&
|
|
echo true >expect &&
|
|
git --git-dir=child/.git config --bool core.foo >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'clone -c config is available during clone' '
|
|
echo content >file &&
|
|
git add file &&
|
|
git commit -m one &&
|
|
rm -rf child &&
|
|
git clone -c core.autocrlf . child &&
|
|
printf "content\\r\\n" >expect &&
|
|
test_cmp expect child/file
|
|
'
|
|
|
|
test_expect_success 'clone -c remote.origin.fetch=<refspec> works' '
|
|
rm -rf child &&
|
|
git update-ref refs/grab/it refs/heads/master &&
|
|
git update-ref refs/leave/out refs/heads/master &&
|
|
git clone -c "remote.origin.fetch=+refs/grab/*:refs/grab/*" . child &&
|
|
git -C child for-each-ref --format="%(refname)" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
refs/grab/it
|
|
refs/heads/master
|
|
refs/remotes/origin/HEAD
|
|
refs/remotes/origin/master
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git -c remote.origin.fetch=<refspec> clone works' '
|
|
rm -rf child &&
|
|
git -c "remote.origin.fetch=+refs/grab/*:refs/grab/*" clone . child &&
|
|
git -C child for-each-ref --format="%(refname)" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
refs/grab/it
|
|
refs/heads/master
|
|
refs/remotes/origin/HEAD
|
|
refs/remotes/origin/master
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'clone -c remote.<remote>.fetch=<refspec> --origin=<name>' '
|
|
rm -rf child &&
|
|
git clone --origin=upstream \
|
|
-c "remote.upstream.fetch=+refs/grab/*:refs/grab/*" \
|
|
-c "remote.origin.fetch=+refs/leave/*:refs/leave/*" \
|
|
. child &&
|
|
git -C child for-each-ref --format="%(refname)" >actual &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
refs/grab/it
|
|
refs/heads/master
|
|
refs/remotes/upstream/HEAD
|
|
refs/remotes/upstream/master
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success MINGW 'clone -c core.hideDotFiles' '
|
|
test_commit attributes .gitattributes "" &&
|
|
rm -rf child &&
|
|
git clone -c core.hideDotFiles=false . child &&
|
|
! test_path_is_hidden child/.gitattributes &&
|
|
rm -rf child &&
|
|
git clone -c core.hideDotFiles=dotGitOnly . child &&
|
|
! test_path_is_hidden child/.gitattributes &&
|
|
rm -rf child &&
|
|
git clone -c core.hideDotFiles=true . child &&
|
|
test_path_is_hidden child/.gitattributes
|
|
'
|
|
|
|
test_done
|