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>
157 lines
3.7 KiB
Bash
Executable File
157 lines
3.7 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='checkout can switch to last branch and merge base'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
echo hello >world &&
|
|
git add world &&
|
|
git commit -m initial &&
|
|
git branch other &&
|
|
echo "hello again" >>world &&
|
|
git add world &&
|
|
git commit -m second
|
|
'
|
|
|
|
test_expect_success '"checkout -" does not work initially' '
|
|
test_must_fail git checkout -
|
|
'
|
|
|
|
test_expect_success 'first branch switch' '
|
|
git checkout other
|
|
'
|
|
|
|
test_expect_success '"checkout -" switches back' '
|
|
git checkout - &&
|
|
test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master"
|
|
'
|
|
|
|
test_expect_success '"checkout -" switches forth' '
|
|
git checkout - &&
|
|
test "z$(git symbolic-ref HEAD)" = "zrefs/heads/other"
|
|
'
|
|
|
|
test_expect_success 'detach HEAD' '
|
|
git checkout $(git rev-parse HEAD)
|
|
'
|
|
|
|
test_expect_success '"checkout -" attaches again' '
|
|
git checkout - &&
|
|
test "z$(git symbolic-ref HEAD)" = "zrefs/heads/other"
|
|
'
|
|
|
|
test_expect_success '"checkout -" detaches again' '
|
|
git checkout - &&
|
|
test "z$(git rev-parse HEAD)" = "z$(git rev-parse other)" &&
|
|
test_must_fail git symbolic-ref HEAD
|
|
'
|
|
|
|
test_expect_success 'more switches' '
|
|
for i in 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1
|
|
do
|
|
git checkout -b branch$i
|
|
done
|
|
'
|
|
|
|
more_switches () {
|
|
for i in 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1
|
|
do
|
|
git checkout branch$i
|
|
done
|
|
}
|
|
|
|
test_expect_success 'switch to the last' '
|
|
more_switches &&
|
|
git checkout @{-1} &&
|
|
test "z$(git symbolic-ref HEAD)" = "zrefs/heads/branch2"
|
|
'
|
|
|
|
test_expect_success 'switch to second from the last' '
|
|
more_switches &&
|
|
git checkout @{-2} &&
|
|
test "z$(git symbolic-ref HEAD)" = "zrefs/heads/branch3"
|
|
'
|
|
|
|
test_expect_success 'switch to third from the last' '
|
|
more_switches &&
|
|
git checkout @{-3} &&
|
|
test "z$(git symbolic-ref HEAD)" = "zrefs/heads/branch4"
|
|
'
|
|
|
|
test_expect_success 'switch to fourth from the last' '
|
|
more_switches &&
|
|
git checkout @{-4} &&
|
|
test "z$(git symbolic-ref HEAD)" = "zrefs/heads/branch5"
|
|
'
|
|
|
|
test_expect_success 'switch to twelfth from the last' '
|
|
more_switches &&
|
|
git checkout @{-12} &&
|
|
test "z$(git symbolic-ref HEAD)" = "zrefs/heads/branch13"
|
|
'
|
|
|
|
test_expect_success 'merge base test setup' '
|
|
git checkout -b another other &&
|
|
echo "hello again" >>world &&
|
|
git add world &&
|
|
git commit -m third
|
|
'
|
|
|
|
test_expect_success 'another...master' '
|
|
git checkout another &&
|
|
git checkout another...master &&
|
|
test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify master^)"
|
|
'
|
|
|
|
test_expect_success '...master' '
|
|
git checkout another &&
|
|
git checkout ...master &&
|
|
test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify master^)"
|
|
'
|
|
|
|
test_expect_success 'master...' '
|
|
git checkout another &&
|
|
git checkout master... &&
|
|
test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify master^)"
|
|
'
|
|
|
|
test_expect_success '"checkout -" works after a rebase A' '
|
|
git checkout master &&
|
|
git checkout other &&
|
|
git rebase master &&
|
|
git checkout - &&
|
|
test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master"
|
|
'
|
|
|
|
test_expect_success '"checkout -" works after a rebase A B' '
|
|
git branch moodle master~1 &&
|
|
git checkout master &&
|
|
git checkout other &&
|
|
git rebase master moodle &&
|
|
git checkout - &&
|
|
test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master"
|
|
'
|
|
|
|
test_expect_success '"checkout -" works after a rebase -i A' '
|
|
git checkout master &&
|
|
git checkout other &&
|
|
git rebase -i master &&
|
|
git checkout - &&
|
|
test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master"
|
|
'
|
|
|
|
test_expect_success '"checkout -" works after a rebase -i A B' '
|
|
git branch foodle master~1 &&
|
|
git checkout master &&
|
|
git checkout other &&
|
|
git rebase master foodle &&
|
|
git checkout - &&
|
|
test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master"
|
|
'
|
|
|
|
test_done
|