mirror of
https://github.com/git/git.git
synced 2024-05-19 12:56:08 +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>
94 lines
3.7 KiB
Bash
Executable File
94 lines
3.7 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='Combination of submodules and multiple worktrees'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
base_path=$(pwd -P)
|
|
|
|
test_expect_success 'setup: create origin repos' '
|
|
git init origin/sub &&
|
|
test_commit -C origin/sub file1 &&
|
|
git init origin/main &&
|
|
test_commit -C origin/main first &&
|
|
git -C origin/main submodule add ../sub &&
|
|
git -C origin/main commit -m "add sub" &&
|
|
test_commit -C origin/sub "file1 updated" file1 file1updated file1updated &&
|
|
git -C origin/main/sub pull &&
|
|
git -C origin/main add sub &&
|
|
git -C origin/main commit -m "sub updated"
|
|
'
|
|
|
|
test_expect_success 'setup: clone superproject to create main worktree' '
|
|
git clone --recursive "$base_path/origin/main" main
|
|
'
|
|
|
|
rev1_hash_main=$(git --git-dir=origin/main/.git show --pretty=format:%h -q "HEAD~1")
|
|
rev1_hash_sub=$(git --git-dir=origin/sub/.git show --pretty=format:%h -q "HEAD~1")
|
|
|
|
test_expect_success 'add superproject worktree' '
|
|
git -C main worktree add "$base_path/worktree" "$rev1_hash_main"
|
|
'
|
|
|
|
test_expect_failure 'submodule is checked out just after worktree add' '
|
|
git -C worktree diff --submodule master"^!" >out &&
|
|
grep "file1 updated" out
|
|
'
|
|
|
|
test_expect_success 'add superproject worktree and initialize submodules' '
|
|
git -C main worktree add "$base_path/worktree-submodule-update" "$rev1_hash_main" &&
|
|
git -C worktree-submodule-update submodule update
|
|
'
|
|
|
|
test_expect_success 'submodule is checked out just after submodule update in linked worktree' '
|
|
git -C worktree-submodule-update diff --submodule master"^!" >out &&
|
|
grep "file1 updated" out
|
|
'
|
|
|
|
test_expect_success 'add superproject worktree and manually add submodule worktree' '
|
|
git -C main worktree add "$base_path/linked_submodule" "$rev1_hash_main" &&
|
|
git -C main/sub worktree add "$base_path/linked_submodule/sub" "$rev1_hash_sub"
|
|
'
|
|
|
|
test_expect_success 'submodule is checked out after manually adding submodule worktree' '
|
|
git -C linked_submodule diff --submodule master"^!" >out &&
|
|
grep "file1 updated" out
|
|
'
|
|
|
|
test_expect_success 'checkout --recurse-submodules uses $GIT_DIR for submodules in a linked worktree' '
|
|
git -C main worktree add "$base_path/checkout-recurse" --detach &&
|
|
git -C checkout-recurse submodule update --init &&
|
|
echo "gitdir: ../../main/.git/worktrees/checkout-recurse/modules/sub" >expect-gitfile &&
|
|
cat checkout-recurse/sub/.git >actual-gitfile &&
|
|
test_cmp expect-gitfile actual-gitfile &&
|
|
git -C main/sub rev-parse HEAD >expect-head-main &&
|
|
git -C checkout-recurse checkout --recurse-submodules HEAD~1 &&
|
|
cat checkout-recurse/sub/.git >actual-gitfile &&
|
|
git -C main/sub rev-parse HEAD >actual-head-main &&
|
|
test_cmp expect-gitfile actual-gitfile &&
|
|
test_cmp expect-head-main actual-head-main
|
|
'
|
|
|
|
test_expect_success 'core.worktree is removed in $GIT_DIR/modules/<name>/config, not in $GIT_COMMON_DIR/modules/<name>/config' '
|
|
echo "../../../sub" >expect-main &&
|
|
git -C main/sub config --get core.worktree >actual-main &&
|
|
test_cmp expect-main actual-main &&
|
|
echo "../../../../../../checkout-recurse/sub" >expect-linked &&
|
|
git -C checkout-recurse/sub config --get core.worktree >actual-linked &&
|
|
test_cmp expect-linked actual-linked &&
|
|
git -C checkout-recurse checkout --recurse-submodules first &&
|
|
test_expect_code 1 git -C main/.git/worktrees/checkout-recurse/modules/sub config --get core.worktree >linked-config &&
|
|
test_must_be_empty linked-config &&
|
|
git -C main/sub config --get core.worktree >actual-main &&
|
|
test_cmp expect-main actual-main
|
|
'
|
|
|
|
test_expect_success 'unsetting core.worktree does not prevent running commands directly against the submodule repository' '
|
|
git -C main/.git/worktrees/checkout-recurse/modules/sub log
|
|
'
|
|
|
|
test_done
|