Skip to content

Commit 334afbc

Browse files
dschogitster
dscho
authored and
gitster
committed
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent fced6d1 commit 334afbc

File tree

325 files changed

+974
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

325 files changed

+974
-0
lines changed

‎ci/run-build-and-tests.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ esac
1313
make
1414
case "$jobname" in
1515
linux-gcc)
16+
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
1617
make test
1718
export GIT_TEST_SPLIT_INDEX=yes
1819
export GIT_TEST_FULL_IN_PACK_ARRAY=true
@@ -22,6 +23,7 @@ linux-gcc)
2223
export GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1
2324
export GIT_TEST_MULTI_PACK_INDEX=1
2425
export GIT_TEST_ADD_I_USE_BUILTIN=1
26+
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
2527
make test
2628
;;
2729
linux-clang)

‎t/t0002-gitfile.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ test_description='.git file
44
55
Verify that plumbing commands work when .git is a file
66
'
7+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
8+
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
9+
710
. ./test-lib.sh
811

912
objpath() {

‎t/t0020-crlf.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
test_description='CRLF conversion'
44

5+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
6+
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7+
58
. ./test-lib.sh
69

710
has_cr() {

‎t/t0021-conversion.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
test_description='blob conversion via gitattributes'
44

5+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
6+
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7+
58
. ./test-lib.sh
69

710
TEST_ROOT="$PWD"

‎t/t0028-working-tree-encoding.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
test_description='working-tree-encoding conversion via gitattributes'
44

5+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
6+
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7+
58
. ./test-lib.sh
69

710
GIT_TRACE_WORKING_TREE_ENCODING=1 && export GIT_TRACE_WORKING_TREE_ENCODING

‎t/t0041-usage.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
test_description='Test commands behavior when given invalid argument value'
44

5+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
6+
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7+
58
. ./test-lib.sh
69

710
test_expect_success 'setup ' '

‎t/t0050-filesystem.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
test_description='Various filesystem issues'
44

5+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
6+
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7+
58
. ./test-lib.sh
69

710
auml=$(printf '\303\244')

‎t/t0100-previous.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
test_description='previous branch syntax @{-n}'
44

5+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
6+
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7+
58
. ./test-lib.sh
69

710
test_expect_success 'branch -d @{-1}' '

‎t/t1004-read-tree-m-u-wf.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
test_description='read-tree -m -u checks working tree files'
44

5+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
6+
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7+
58
. ./test-lib.sh
69
. "$TEST_DIRECTORY"/lib-read-tree.sh
710

‎t/t1008-read-tree-overlay.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
test_description='test multi-tree read-tree without merging'
44

5+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
6+
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7+
58
. ./test-lib.sh
69
. "$TEST_DIRECTORY"/lib-read-tree.sh
710

0 commit comments

Comments
 (0)