mirror of
https://github.com/git/git.git
synced 2024-11-24 02:17:02 +08:00
06d531486e
Carefully excluding t1309, which sees independent development elsewhere at the time of writing, we transition above-mentioned tests to the default branch name `main`. This trick was performed via $ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -e 's/naster/nain/g' -- t[01]*.sh && git checkout HEAD -- t1309\*) Note that t5533 contains a variation of the name `master` (`naster`) that we rename here, too. This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main` for those tests. Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
77 lines
2.1 KiB
Bash
Executable File
77 lines
2.1 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='test <branch>@{push} syntax'
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
resolve () {
|
|
echo "$2" >expect &&
|
|
git rev-parse --symbolic-full-name "$1" >actual &&
|
|
test_cmp expect actual
|
|
}
|
|
|
|
test_expect_success 'setup' '
|
|
git init --bare parent.git &&
|
|
git init --bare other.git &&
|
|
git remote add origin parent.git &&
|
|
git remote add other other.git &&
|
|
test_commit base &&
|
|
git push origin HEAD &&
|
|
git branch --set-upstream-to=origin/main main &&
|
|
git branch --track topic origin/main &&
|
|
git push origin topic &&
|
|
git push other topic
|
|
'
|
|
|
|
test_expect_success '@{push} with default=nothing' '
|
|
test_config push.default nothing &&
|
|
test_must_fail git rev-parse main@{push} &&
|
|
test_must_fail git rev-parse main@{PUSH} &&
|
|
test_must_fail git rev-parse main@{PuSH}
|
|
'
|
|
|
|
test_expect_success '@{push} with default=simple' '
|
|
test_config push.default simple &&
|
|
resolve main@{push} refs/remotes/origin/main &&
|
|
resolve main@{PUSH} refs/remotes/origin/main &&
|
|
resolve main@{pUSh} refs/remotes/origin/main
|
|
'
|
|
|
|
test_expect_success 'triangular @{push} fails with default=simple' '
|
|
test_config push.default simple &&
|
|
test_must_fail git rev-parse topic@{push}
|
|
'
|
|
|
|
test_expect_success '@{push} with default=current' '
|
|
test_config push.default current &&
|
|
resolve topic@{push} refs/remotes/origin/topic
|
|
'
|
|
|
|
test_expect_success '@{push} with default=matching' '
|
|
test_config push.default matching &&
|
|
resolve topic@{push} refs/remotes/origin/topic
|
|
'
|
|
|
|
test_expect_success '@{push} with pushremote defined' '
|
|
test_config push.default current &&
|
|
test_config branch.topic.pushremote other &&
|
|
resolve topic@{push} refs/remotes/other/topic
|
|
'
|
|
|
|
test_expect_success '@{push} with push refspecs' '
|
|
test_config push.default nothing &&
|
|
test_config remote.origin.push refs/heads/*:refs/heads/magic/* &&
|
|
git push &&
|
|
resolve topic@{push} refs/remotes/origin/magic/topic
|
|
'
|
|
|
|
test_expect_success 'resolving @{push} fails with a detached HEAD' '
|
|
git checkout HEAD^0 &&
|
|
test_when_finished "git checkout -" &&
|
|
test_must_fail git rev-parse @{push}
|
|
'
|
|
|
|
test_done
|