undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t5505: finalize transitioning to using the branch name main

Browse Source 
In 66713e84e7 (tests: prepare aligned mentions of the default branch
name, 2020-10-23), we started that transition, trying to prepare for a
time when `git init` would use that name for the initial branch.

Even if that time has not arrived, we can complete the transition by
making the test script independent of the default branch name. This also
allows us to drop the `PREPARE_FOR_MAIN_BRANCH` prereq from four test
cases.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2020-12-17 01:07:05 +00:00 committed by Junio C Hamano
parent 654bd7e8a9
commit 97b913681b
1 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
t/t5505-remote.sh
View File

@ -7,7 +7,7 @@ test_description='git remote porcelain-ish'
setup_repository () { setup_repository () {
mkdir "$1" && ( mkdir "$1" && (
cd "$1" && cd "$1" &&
git init && git init -b main &&
>file && >file &&
git add file && git add file &&
test_tick && test_tick &&
@ -17,7 +17,7 @@ setup_repository () {
git add elif && git add elif &&
test_tick && test_tick &&
git commit -m "Second" && git commit -m "Second" &&
git checkout master git checkout main
) )
} }
@ -60,8 +60,8 @@ test_expect_success C_LOCALE_OUTPUT 'remote information for the origin' '
( (
cd test && cd test &&
tokens_match origin "$(git remote)" && tokens_match origin "$(git remote)" &&
check_remote_track origin master side && check_remote_track origin main side &&
check_tracking_branch origin HEAD master side check_tracking_branch origin HEAD main side
) )
' '
@ -70,7 +70,7 @@ test_expect_success 'add another remote' '
cd test && cd test &&
git remote add -f second ../two && git remote add -f second ../two &&
tokens_match "origin second" "$(git remote)" && tokens_match "origin second" "$(git remote)" &&
check_tracking_branch second master side another && check_tracking_branch second main side another &&
git for-each-ref "--format=%(refname)" refs/remotes | git for-each-ref "--format=%(refname)" refs/remotes |
sed -e "/^refs\/remotes\/origin\//d" \ sed -e "/^refs\/remotes\/origin\//d" \
-e "/^refs\/remotes\/second\//d" >actual && -e "/^refs\/remotes\/second\//d" >actual &&
@ -81,8 +81,8 @@ test_expect_success 'add another remote' '
test_expect_success C_LOCALE_OUTPUT 'check remote-tracking' ' test_expect_success C_LOCALE_OUTPUT 'check remote-tracking' '
( (
cd test && cd test &&
check_remote_track origin master side && check_remote_track origin main side &&
check_remote_track second master side another check_remote_track second main side another
) )
' '
@ -99,7 +99,7 @@ test_expect_success 'remote forces tracking branches' '
test_expect_success 'remove remote' ' test_expect_success 'remove remote' '
( (
cd test && cd test &&
git symbolic-ref refs/remotes/second/HEAD refs/remotes/second/master && git symbolic-ref refs/remotes/second/HEAD refs/remotes/second/main &&
git remote rm second git remote rm second
) )
' '
@ -108,7 +108,7 @@ test_expect_success C_LOCALE_OUTPUT 'remove remote' '
( (
cd test && cd test &&
tokens_match origin "$(git remote)" && tokens_match origin "$(git remote)" &&
check_remote_track origin master side && check_remote_track origin main side &&
git for-each-ref "--format=%(refname)" refs/remotes | git for-each-ref "--format=%(refname)" refs/remotes |
sed -e "/^refs\/remotes\/origin\//d" >actual && sed -e "/^refs\/remotes\/origin\//d" >actual &&
test_must_be_empty actual test_must_be_empty actual
@ -121,13 +121,13 @@ test_expect_success 'remove remote protects local branches' '
cat >expect1 <<-\EOF && cat >expect1 <<-\EOF &&
Note: A branch outside the refs/remotes/ hierarchy was not removed; Note: A branch outside the refs/remotes/ hierarchy was not removed;
to delete it, use: to delete it, use:
git branch -d master git branch -d main
EOF EOF
cat >expect2 <<-\EOF && cat >expect2 <<-\EOF &&
Note: Some branches outside the refs/remotes/ hierarchy were not removed; Note: Some branches outside the refs/remotes/ hierarchy were not removed;
to delete them, use: to delete them, use:
git branch -d foobranch git branch -d foobranch
git branch -d master git branch -d main
EOF EOF
git tag footag && git tag footag &&
git config --add remote.oops.fetch "+refs/*:refs/*" && git config --add remote.oops.fetch "+refs/*:refs/*" &&
@ -153,7 +153,7 @@ test_expect_success 'remove errors out early when deleting non-existent branch'
test_expect_success 'remove remote with a branch without configured merge' ' test_expect_success 'remove remote with a branch without configured merge' '
test_when_finished "( test_when_finished "(
git -C test checkout master; git -C test checkout main;
git -C test branch -D two; git -C test branch -D two;
git -C test config --remove-section remote.two; git -C test config --remove-section remote.two;
git -C test config --remove-section branch.second; git -C test config --remove-section branch.second;
@ -163,9 +163,9 @@ test_expect_success 'remove remote with a branch without configured merge' '
cd test && cd test &&
git remote add two ../two && git remote add two ../two &&
git fetch two && git fetch two &&
git checkout -b second two/master^0 && git checkout -b second two/main^0 &&
git config branch.second.remote two && git config branch.second.remote two &&
git checkout master && git checkout main &&
git remote rm two git remote rm two
) )
' '
@ -211,7 +211,7 @@ cat >test/expect <<EOF
* remote origin * remote origin
Fetch URL: $(pwd)/one Fetch URL: $(pwd)/one
Push URL: $(pwd)/one Push URL: $(pwd)/one
HEAD branch: master HEAD branch: main
Remote branches: Remote branches:
main new (next fetch will store in remotes/origin) main new (next fetch will store in remotes/origin)
side tracked side tracked
@ -221,32 +221,32 @@ cat >test/expect <<EOF
octopus merges with remote topic-a octopus merges with remote topic-a
and with remote topic-b and with remote topic-b
and with remote topic-c and with remote topic-c
rebase rebases onto remote master rebase rebases onto remote main
Local refs configured for 'git push': Local refs configured for 'git push':
main pushes to main (local out of date) main pushes to main (local out of date)
main pushes to upstream (create) main pushes to upstream (create)
* remote two * remote two
Fetch URL: ../two Fetch URL: ../two
Push URL: ../three Push URL: ../three
HEAD branch: master HEAD branch: main
Local refs configured for 'git push': Local refs configured for 'git push':
ahead forces to main (fast-forwardable) ahead forces to main (fast-forwardable)
main pushes to another (up to date) main pushes to another (up to date)
EOF EOF
test_expect_success PREPARE_FOR_MAIN_BRANCH 'show' ' test_expect_success 'show' '
( (
cd test && cd test &&
git config --add remote.origin.fetch refs/heads/master:refs/heads/upstream && git config --add remote.origin.fetch refs/heads/main:refs/heads/upstream &&
git fetch && git fetch &&
git checkout -b ahead origin/master && git checkout -b ahead origin/main &&
echo 1 >>file && echo 1 >>file &&
test_tick && test_tick &&
git commit -m update file && git commit -m update file &&
git checkout master && git checkout main &&
git branch --track octopus origin/master && git branch --track octopus origin/main &&
git branch --track rebase origin/master && git branch --track rebase origin/main &&
git branch -d -r origin/master && git branch -d -r origin/main &&
git config --add remote.two.url ../two && git config --add remote.two.url ../two &&
git config --add remote.two.pushurl ../three && git config --add remote.two.pushurl ../three &&
git config branch.rebase.rebase true && git config branch.rebase.rebase true &&
@ -258,10 +258,10 @@ test_expect_success PREPARE_FOR_MAIN_BRANCH 'show' '
git commit -m update file git commit -m update file
) && ) &&
git config --add remote.origin.push : && git config --add remote.origin.push : &&
git config --add remote.origin.push refs/heads/master:refs/heads/upstream && git config --add remote.origin.push refs/heads/main:refs/heads/upstream &&
git config --add remote.origin.push +refs/tags/lastbackup && git config --add remote.origin.push +refs/tags/lastbackup &&
git config --add remote.two.push +refs/heads/ahead:refs/heads/master && git config --add remote.two.push +refs/heads/ahead:refs/heads/main &&
git config --add remote.two.push refs/heads/master:refs/heads/another && git config --add remote.two.push refs/heads/main:refs/heads/another &&
git remote show origin two >output && git remote show origin two >output &&
git branch -d rebase octopus && git branch -d rebase octopus &&
test_i18ncmp expect output test_i18ncmp expect output
@ -274,7 +274,7 @@ cat >test/expect <<EOF
Push URL: $(pwd)/one Push URL: $(pwd)/one
HEAD branch: (not queried) HEAD branch: (not queried)
Remote branches: (status not queried) Remote branches: (status not queried)
master main
side side
Local branches configured for 'git pull': Local branches configured for 'git pull':
ahead merges with remote main ahead merges with remote main
@ -285,7 +285,7 @@ cat >test/expect <<EOF
refs/tags/lastbackup forces to refs/tags/lastbackup refs/tags/lastbackup forces to refs/tags/lastbackup
EOF EOF
test_expect_success PREPARE_FOR_MAIN_BRANCH 'show -n' ' test_expect_success 'show -n' '
mv one one.unreachable && mv one one.unreachable &&
( (
cd test && cd test &&
@ -322,18 +322,18 @@ test_expect_success 'set-head --auto' '
( (
cd test && cd test &&
git remote set-head --auto origin && git remote set-head --auto origin &&
echo refs/remotes/origin/master >expect && echo refs/remotes/origin/main >expect &&
git symbolic-ref refs/remotes/origin/HEAD >output && git symbolic-ref refs/remotes/origin/HEAD >output &&
test_cmp expect output test_cmp expect output
) )
' '
test_expect_success PREPARE_FOR_MAIN_BRANCH 'set-head --auto has no problem w/multiple HEADs' ' test_expect_success 'set-head --auto has no problem w/multiple HEADs' '
( (
cd test && cd test &&
git fetch two "refs/heads/*:refs/remotes/two/*" && git fetch two "refs/heads/*:refs/remotes/two/*" &&
git remote set-head --auto two >output 2>&1 && git remote set-head --auto two >output 2>&1 &&
echo "two/HEAD set to master" >expect && echo "two/HEAD set to main" >expect &&
test_i18ncmp expect output test_i18ncmp expect output
) )
' '
@ -347,7 +347,7 @@ test_expect_success 'set-head explicit' '
cd test && cd test &&
git remote set-head origin side2 && git remote set-head origin side2 &&
git symbolic-ref refs/remotes/origin/HEAD >output && git symbolic-ref refs/remotes/origin/HEAD >output &&
git remote set-head origin master && git remote set-head origin main &&
test_cmp expect output test_cmp expect output
) )
' '
@ -394,7 +394,7 @@ test_expect_success 'add --mirror && prune' '
test_expect_success 'add --mirror=fetch' ' test_expect_success 'add --mirror=fetch' '
mkdir mirror-fetch && mkdir mirror-fetch &&
git init mirror-fetch/parent && git init -b main mirror-fetch/parent &&
( (
cd mirror-fetch/parent && cd mirror-fetch/parent &&
test_commit one test_commit one
@ -410,7 +410,7 @@ test_expect_success 'fetch mirrors act as mirrors during fetch' '
( (
cd mirror-fetch/parent && cd mirror-fetch/parent &&
git branch new && git branch new &&
git branch -m master renamed git branch -m main renamed
) && ) &&
( (
cd mirror-fetch/child && cd mirror-fetch/child &&
@ -424,7 +424,7 @@ test_expect_success 'fetch mirrors can prune' '
( (
cd mirror-fetch/child && cd mirror-fetch/child &&
git remote prune parent && git remote prune parent &&
test_must_fail git rev-parse --verify refs/heads/master test_must_fail git rev-parse --verify refs/heads/main
) )
' '
@ -465,7 +465,7 @@ test_expect_success 'fetch mirror respects specific branches' '
test_expect_success 'add --mirror=push' ' test_expect_success 'add --mirror=push' '
mkdir mirror-push && mkdir mirror-push &&
git init --bare mirror-push/public && git init --bare mirror-push/public &&
git init mirror-push/private && git init -b main mirror-push/private &&
( (
cd mirror-push/private && cd mirror-push/private &&
test_commit one && test_commit one &&
@ -477,14 +477,14 @@ test_expect_success 'push mirrors act as mirrors during push' '
( (
cd mirror-push/private && cd mirror-push/private &&
git branch new && git branch new &&
git branch -m master renamed && git branch -m main renamed &&
git push public git push public
) && ) &&
( (
cd mirror-push/private && cd mirror-push/private &&
git rev-parse --verify refs/heads/new && git rev-parse --verify refs/heads/new &&
git rev-parse --verify refs/heads/renamed && git rev-parse --verify refs/heads/renamed &&
test_must_fail git rev-parse --verify refs/heads/master test_must_fail git rev-parse --verify refs/heads/main
) )
' '
@ -610,10 +610,10 @@ test_expect_success 'reject --no-no-tags' '
' '
cat >one/expect <<\EOF cat >one/expect <<\EOF
apis/master apis/main
apis/side apis/side
drosophila/another drosophila/another
drosophila/master drosophila/main
drosophila/side drosophila/side
EOF EOF
@ -630,11 +630,11 @@ test_expect_success 'update' '
cat >one/expect <<\EOF cat >one/expect <<\EOF
drosophila/another drosophila/another
drosophila/master drosophila/main
drosophila/side drosophila/side
manduca/master manduca/main
manduca/side manduca/side
megaloprepus/master megaloprepus/main
megaloprepus/side megaloprepus/side
EOF EOF
@ -673,11 +673,11 @@ test_expect_success 'update --prune' '
' '
cat >one/expect <<-\EOF cat >one/expect <<-\EOF
apis/master apis/main
apis/side apis/side
manduca/master manduca/main
manduca/side manduca/side
megaloprepus/master megaloprepus/main
megaloprepus/side megaloprepus/side
EOF EOF
@ -697,7 +697,7 @@ test_expect_success 'update default' '
cat >one/expect <<\EOF cat >one/expect <<\EOF
drosophila/another drosophila/another
drosophila/master drosophila/main
drosophila/side drosophila/side
EOF EOF
@ -751,14 +751,14 @@ test_expect_success 'rename a remote' '
git clone one four && git clone one four &&
( (
cd four && cd four &&
git config branch.master.pushRemote origin && git config branch.main.pushRemote origin &&
git remote rename origin upstream && git remote rename origin upstream &&
test -z "$(git for-each-ref refs/remotes/origin)" && test -z "$(git for-each-ref refs/remotes/origin)" &&
test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/master" && test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/main" &&
test "$(git rev-parse upstream/master)" = "$(git rev-parse master)" && test "$(git rev-parse upstream/main)" = "$(git rev-parse main)" &&
test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" && test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" &&
test "$(git config branch.master.remote)" = "upstream" && test "$(git config branch.main.remote)" = "upstream" &&
test "$(git config branch.master.pushRemote)" = "upstream" && test "$(git config branch.main.pushRemote)" = "upstream" &&
test "$(git config --global remote.pushDefault)" = "origin" test "$(git config --global remote.pushDefault)" = "origin"
) )
' '
@ -804,7 +804,7 @@ test_expect_success 'rename does not update a non-default fetch refspec' '
git config remote.origin.fetch +refs/heads/*:refs/heads/origin/* && git config remote.origin.fetch +refs/heads/*:refs/heads/origin/* &&
git remote rename origin upstream && git remote rename origin upstream &&
test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/heads/origin/*" && test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/heads/origin/*" &&
git rev-parse -q origin/master git rev-parse -q origin/main
) )
' '
@ -824,7 +824,7 @@ test_expect_success 'rename a remote with name prefix of other remote' '
cd four.three && cd four.three &&
git remote add o git://example.com/repo.git && git remote add o git://example.com/repo.git &&
git remote rename o upstream && git remote rename o upstream &&
test "$(git rev-parse origin/master)" = "$(git rev-parse master)" test "$(git rev-parse origin/main)" = "$(git rev-parse main)"
) )
' '
@ -840,11 +840,11 @@ test_expect_success 'remove a remote' '
git clone one four.five && git clone one four.five &&
( (
cd four.five && cd four.five &&
git config branch.master.pushRemote origin && git config branch.main.pushRemote origin &&
git remote remove origin && git remote remove origin &&
test -z "$(git for-each-ref refs/remotes/origin)" && test -z "$(git for-each-ref refs/remotes/origin)" &&
test_must_fail git config branch.master.remote && test_must_fail git config branch.main.remote &&
test_must_fail git config branch.master.pushRemote && test_must_fail git config branch.main.pushRemote &&
test "$(git config --global remote.pushDefault)" = "origin" test "$(git config --global remote.pushDefault)" = "origin"
) )
' '
@ -885,9 +885,9 @@ test_expect_success 'remove a remote removes repo remote.pushDefault but keeps g
cat >remotes_origin <<EOF cat >remotes_origin <<EOF
URL: $(pwd)/one URL: $(pwd)/one
Push: refs/heads/master:refs/heads/upstream Push: refs/heads/main:refs/heads/upstream
Push: refs/heads/next:refs/heads/upstream2 Push: refs/heads/next:refs/heads/upstream2
Pull: refs/heads/master:refs/heads/origin Pull: refs/heads/main:refs/heads/origin
Pull: refs/heads/next:refs/heads/origin2 Pull: refs/heads/next:refs/heads/origin2
EOF EOF
@ -903,11 +903,11 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/remotes' '
test_path_is_missing .git/remotes/origin && test_path_is_missing .git/remotes/origin &&
test "$(git config remote.origin.url)" = "$origin_url" && test "$(git config remote.origin.url)" = "$origin_url" &&
cat >push_expected <<-\EOF && cat >push_expected <<-\EOF &&
refs/heads/master:refs/heads/upstream refs/heads/main:refs/heads/upstream
refs/heads/next:refs/heads/upstream2 refs/heads/next:refs/heads/upstream2
EOF EOF
cat >fetch_expected <<-\EOF && cat >fetch_expected <<-\EOF &&
refs/heads/master:refs/heads/origin refs/heads/main:refs/heads/origin
refs/heads/next:refs/heads/origin2 refs/heads/next:refs/heads/origin2
EOF EOF
git config --get-all remote.origin.push >push_actual && git config --get-all remote.origin.push >push_actual &&
@ -923,12 +923,12 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/branches' '
( (
cd six && cd six &&
git remote rm origin && git remote rm origin &&
echo "$origin_url" >.git/branches/origin && echo "$origin_url#main" >.git/branches/origin &&
git remote rename origin origin && git remote rename origin origin &&
test_path_is_missing .git/branches/origin && test_path_is_missing .git/branches/origin &&
test "$(git config remote.origin.url)" = "$origin_url" && test "$(git config remote.origin.url)" = "$origin_url" &&
test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin" && test "$(git config remote.origin.fetch)" = "refs/heads/main:refs/heads/origin" &&
test "$(git config remote.origin.push)" = "HEAD:refs/heads/master" test "$(git config remote.origin.push)" = "HEAD:refs/heads/main"
) )
' '
@ -951,7 +951,7 @@ test_expect_success 'remote prune to cause a dangling symref' '
( (
cd one && cd one &&
git checkout side2 && git checkout side2 &&
git branch -D master git branch -D main
) && ) &&
( (
cd eight && cd eight &&
@ -994,22 +994,22 @@ test_expect_success 'remote set-branches' '
EOF EOF
sort <<-\EOF >expect.replace && sort <<-\EOF >expect.replace &&
+refs/heads/maint:refs/remotes/scratch/maint +refs/heads/maint:refs/remotes/scratch/maint
+refs/heads/master:refs/remotes/scratch/master +refs/heads/main:refs/remotes/scratch/main
+refs/heads/next:refs/remotes/scratch/next +refs/heads/next:refs/remotes/scratch/next
EOF EOF
sort <<-\EOF >expect.add-two && sort <<-\EOF >expect.add-two &&
+refs/heads/maint:refs/remotes/scratch/maint +refs/heads/maint:refs/remotes/scratch/maint
+refs/heads/master:refs/remotes/scratch/master +refs/heads/main:refs/remotes/scratch/main
+refs/heads/next:refs/remotes/scratch/next +refs/heads/next:refs/remotes/scratch/next
+refs/heads/seen:refs/remotes/scratch/seen +refs/heads/seen:refs/remotes/scratch/seen
+refs/heads/t/topic:refs/remotes/scratch/t/topic +refs/heads/t/topic:refs/remotes/scratch/t/topic
EOF EOF
sort <<-\EOF >expect.setup-ffonly && sort <<-\EOF >expect.setup-ffonly &&
refs/heads/master:refs/remotes/scratch/master refs/heads/main:refs/remotes/scratch/main
+refs/heads/next:refs/remotes/scratch/next +refs/heads/next:refs/remotes/scratch/next
EOF EOF
sort <<-\EOF >expect.respect-ffonly && sort <<-\EOF >expect.respect-ffonly &&
refs/heads/master:refs/remotes/scratch/master refs/heads/main:refs/remotes/scratch/main
+refs/heads/next:refs/remotes/scratch/next +refs/heads/next:refs/remotes/scratch/next
+refs/heads/seen:refs/remotes/scratch/seen +refs/heads/seen:refs/remotes/scratch/seen
EOF EOF
@ -1025,7 +1025,7 @@ test_expect_success 'remote set-branches' '
git config --get-all remote.scratch.fetch >config-result && git config --get-all remote.scratch.fetch >config-result &&
sort <config-result >../actual.add && sort <config-result >../actual.add &&
git remote set-branches scratch maint master next && git remote set-branches scratch maint main next &&
git config --get-all remote.scratch.fetch >config-result && git config --get-all remote.scratch.fetch >config-result &&
sort <config-result >../actual.replace && sort <config-result >../actual.replace &&
@ -1035,7 +1035,7 @@ test_expect_success 'remote set-branches' '
git config --unset-all remote.scratch.fetch && git config --unset-all remote.scratch.fetch &&
git config remote.scratch.fetch \ git config remote.scratch.fetch \
refs/heads/master:refs/remotes/scratch/master && refs/heads/main:refs/remotes/scratch/main &&
git config --add remote.scratch.fetch \ git config --add remote.scratch.fetch \
+refs/heads/next:refs/remotes/scratch/next && +refs/heads/next:refs/remotes/scratch/next &&
git config --get-all remote.scratch.fetch >config-result && git config --get-all remote.scratch.fetch >config-result &&
@ -1055,14 +1055,14 @@ test_expect_success 'remote set-branches' '
test_expect_success 'remote set-branches with --mirror' ' test_expect_success 'remote set-branches with --mirror' '
echo "+refs/*:refs/*" >expect.initial && echo "+refs/*:refs/*" >expect.initial &&
echo "+refs/heads/master:refs/heads/master" >expect.replace && echo "+refs/heads/main:refs/heads/main" >expect.replace &&
git clone --mirror .git/ setbranches-mirror && git clone --mirror .git/ setbranches-mirror &&
( (
cd setbranches-mirror && cd setbranches-mirror &&
git remote rename origin scratch && git remote rename origin scratch &&
git config --get-all remote.scratch.fetch >../actual.initial && git config --get-all remote.scratch.fetch >../actual.initial &&
git remote set-branches scratch heads/master && git remote set-branches scratch heads/main &&
git config --get-all remote.scratch.fetch >../actual.replace git config --get-all remote.scratch.fetch >../actual.replace
) && ) &&
test_cmp expect.initial actual.initial && test_cmp expect.initial actual.initial &&
@ -1308,7 +1308,7 @@ test_extra_arg () {
test_extra_arg add nick url test_extra_arg add nick url
test_extra_arg rename origin newname test_extra_arg rename origin newname
test_extra_arg remove origin test_extra_arg remove origin
test_extra_arg set-head origin master test_extra_arg set-head origin main
# set-branches takes any number of args # set-branches takes any number of args
test_extra_arg get-url origin newurl test_extra_arg get-url origin newurl
test_extra_arg set-url origin newurl oldurl test_extra_arg set-url origin newurl oldurl
@ -1325,7 +1325,7 @@ test_expect_success 'unqualified <dst> refspec DWIM and advice' '
test_when_finished "(cd test && git tag -d some-tag)" && test_when_finished "(cd test && git tag -d some-tag)" &&
( (
cd test && cd test &&
git tag -a -m "Some tag" some-tag master && git tag -a -m "Some tag" some-tag main &&
exit_with=true && exit_with=true &&
for type in commit tag tree blob for type in commit tag tree blob
do do
@ -1348,10 +1348,10 @@ test_expect_success 'unqualified <dst> refspec DWIM and advice' '
) )
' '
test_expect_success PREPARE_FOR_MAIN_BRANCH 'refs/remotes/* <src> refspec and unqualified <dst> DWIM and advice' ' test_expect_success 'refs/remotes/* <src> refspec and unqualified <dst> DWIM and advice' '
( (
cd two && cd two &&
git tag -a -m "Some tag" my-tag master && git tag -a -m "Some tag" my-tag main &&
git update-ref refs/trees/my-head-tree HEAD^{tree} && git update-ref refs/trees/my-head-tree HEAD^{tree} &&
git update-ref refs/blobs/my-file-blob HEAD:file git update-ref refs/blobs/my-file-blob HEAD:file
) && ) &&