microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

t55[23]*: adjust the references to the default branch name "main" 

Carefully excluding t5526, which sees independent development elsewhere
at the time of writing, we use `main` as the default branch name in
t55[23]*. 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' -- \
		t55[23]*.sh &&
	   git checkout HEAD -- t5526\*)

Note that t5533 contains a variation of the name `master` (`naster`)
that we rename here, too.

This commit allows us to define
`GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main` for that range of tests.

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-11-18 23:44:33 +00:00 коммит произвёл Junio C Hamano
Родитель bc925ce3f3
Коммит 3ac8f6301e
13 изменённых файлов: 307 добавлений и 307 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

32
t/t5520-pull.sh
Просмотреть файл

@ -2,7 +2,7 @@
test_description='pulling into void' test_description='pulling into void'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh . ./test-lib.sh
@ -51,11 +51,11 @@ test_expect_success 'pulling into void' '
test_cmp file cloned/file test_cmp file cloned/file
' '
test_expect_success 'pulling into void using master:master' ' test_expect_success 'pulling into void using main:main' '
git init cloned-uho && git init cloned-uho &&
( (
cd cloned-uho && cd cloned-uho &&
git pull .. master:master git pull .. main:main
) && ) &&
test_path_is_file file && test_path_is_file file &&
test_path_is_file cloned-uho/file && test_path_is_file cloned-uho/file &&
@ -67,7 +67,7 @@ test_expect_success 'pulling into void does not overwrite untracked files' '
( (
cd cloned-untracked && cd cloned-untracked &&
echo untracked >file && echo untracked >file &&
test_must_fail git pull .. master && test_must_fail git pull .. main &&
echo untracked >expect && echo untracked >expect &&
test_cmp expect file test_cmp expect file
) )
@ -79,7 +79,7 @@ test_expect_success 'pulling into void does not overwrite staged files' '
cd cloned-staged-colliding && cd cloned-staged-colliding &&
echo "alternate content" >file && echo "alternate content" >file &&
git add file && git add file &&
test_must_fail git pull .. master && test_must_fail git pull .. main &&
echo "alternate content" >expect && echo "alternate content" >expect &&
test_cmp expect file && test_cmp expect file &&
git cat-file blob :file >file.index && git cat-file blob :file >file.index &&
@ -93,7 +93,7 @@ test_expect_success 'pulling into void does not remove new staged files' '
cd cloned-staged-new && cd cloned-staged-new &&
echo "new tracked file" >newfile && echo "new tracked file" >newfile &&
git add newfile && git add newfile &&
git pull .. master && git pull .. main &&
echo "new tracked file" >expect && echo "new tracked file" >expect &&
test_cmp expect newfile && test_cmp expect newfile &&
git cat-file blob :newfile >newfile.index && git cat-file blob :newfile >newfile.index &&
@ -105,15 +105,15 @@ test_expect_success 'pulling into void must not create an octopus' '
git init cloned-octopus && git init cloned-octopus &&
( (
cd cloned-octopus && cd cloned-octopus &&
test_must_fail git pull .. master master && test_must_fail git pull .. main main &&
test_path_is_missing file test_path_is_missing file
) )
' '
test_expect_success 'test . as a remote' ' test_expect_success 'test . as a remote' '
git branch copy master && git branch copy main &&
git config branch.copy.remote . && git config branch.copy.remote . &&
git config branch.copy.merge refs/heads/master && git config branch.copy.merge refs/heads/main &&
echo updated >file && echo updated >file &&
git commit -a -m updated && git commit -a -m updated &&
git checkout copy && git checkout copy &&
@ -129,7 +129,7 @@ test_expect_success 'test . as a remote' '
' '
test_expect_success 'the default remote . should not break explicit pull' ' test_expect_success 'the default remote . should not break explicit pull' '
git checkout -b second master^ && git checkout -b second main^ &&
echo modified >file && echo modified >file &&
git commit -a -m modified && git commit -a -m modified &&
git checkout copy && git checkout copy &&
@ -364,7 +364,7 @@ test_expect_success 'failed --rebase shows advice' '
test_expect_success '--rebase fails with multiple branches' ' test_expect_success '--rebase fails with multiple branches' '
git reset --hard before-rebase && git reset --hard before-rebase &&
test_must_fail git pull --rebase . copy master 2>err && test_must_fail git pull --rebase . copy main 2>err &&
test_cmp_rev HEAD before-rebase && test_cmp_rev HEAD before-rebase &&
test_i18ngrep "Cannot rebase onto multiple branches" err && test_i18ngrep "Cannot rebase onto multiple branches" err &&
echo modified >expect && echo modified >expect &&
@ -503,7 +503,7 @@ test_expect_success 'pull --rebase does not warn on --no-verify-signatures' '
test_i18ngrep ! "verify-signatures" err test_i18ngrep ! "verify-signatures" err
' '
# add a feature branch, keep-merge, that is merged into master, so the # add a feature branch, keep-merge, that is merged into main, so the
# test can try preserving the merge commit (or not) with various # test can try preserving the merge commit (or not) with various
# --rebase flags/pull.rebase settings. # --rebase flags/pull.rebase settings.
test_expect_success 'preserve merge setup' ' test_expect_success 'preserve merge setup' '
@ -702,12 +702,12 @@ test_expect_success 'pull --rebase dies early with dirty working directory' '
' '
test_expect_success 'pull --rebase works on branch yet to be born' ' test_expect_success 'pull --rebase works on branch yet to be born' '
git rev-parse master >expect && git rev-parse main >expect &&
mkdir empty_repo && mkdir empty_repo &&
( (
cd empty_repo && cd empty_repo &&
git init && git init &&
git pull --rebase .. master && git pull --rebase .. main &&
git rev-parse HEAD >../actual git rev-parse HEAD >../actual
) && ) &&
test_cmp expect actual test_cmp expect actual
@ -723,7 +723,7 @@ test_expect_success 'pull --rebase fails on unborn branch with staged changes' '
echo staged-file >expect && echo staged-file >expect &&
git ls-files >actual && git ls-files >actual &&
test_cmp expect actual && test_cmp expect actual &&
test_must_fail git pull --rebase .. master 2>err && test_must_fail git pull --rebase .. main 2>err &&
git ls-files >actual && git ls-files >actual &&
test_cmp expect actual && test_cmp expect actual &&
git show :staged-file >actual && git show :staged-file >actual &&
@ -782,7 +782,7 @@ test_expect_success 'setup for avoiding reapplying old patches' '
( (
cd dst && cd dst &&
test_might_fail git rebase --abort && test_might_fail git rebase --abort &&
git reset --hard origin/master git reset --hard origin/main
) && ) &&
git clone --bare src src-replace.git && git clone --bare src src-replace.git &&
rm -rf src && rm -rf src &&

18
t/t5521-pull-options.sh
Просмотреть файл

@ -2,7 +2,7 @@
test_description='pull options' test_description='pull options'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh . ./test-lib.sh
@ -102,13 +102,13 @@ test_expect_success 'git pull --force' '
cat >>.git/config <<-\EOF && cat >>.git/config <<-\EOF &&
[remote "one"] [remote "one"]
url = ../parent url = ../parent
fetch = refs/heads/master:refs/heads/mirror fetch = refs/heads/main:refs/heads/mirror
[remote "two"] [remote "two"]
url = ../parent url = ../parent
fetch = refs/heads/master:refs/heads/origin fetch = refs/heads/main:refs/heads/origin
[branch "master"] [branch "main"]
remote = two remote = two
merge = refs/heads/master merge = refs/heads/main
EOF EOF
git pull two && git pull two &&
test_commit A && test_commit A &&
@ -127,9 +127,9 @@ test_expect_success 'git pull --all' '
[remote "two"] [remote "two"]
url = ../parent url = ../parent
fetch = refs/heads/*:refs/remotes/two/* fetch = refs/heads/*:refs/remotes/two/*
[branch "master"] [branch "main"]
remote = one remote = one
merge = refs/heads/master merge = refs/heads/main
EOF EOF
git pull --all git pull --all
) )
@ -142,7 +142,7 @@ test_expect_success 'git pull --dry-run' '
cd clonedry && cd clonedry &&
git pull --dry-run ../parent && git pull --dry-run ../parent &&
test_path_is_missing .git/FETCH_HEAD && test_path_is_missing .git/FETCH_HEAD &&
test_path_is_missing .git/refs/heads/master && test_path_is_missing .git/refs/heads/main &&
test_path_is_missing .git/index && test_path_is_missing .git/index &&
test_path_is_missing file test_path_is_missing file
) )
@ -156,7 +156,7 @@ test_expect_success 'git pull --all --dry-run' '
git remote add origin ../parent && git remote add origin ../parent &&
git pull --all --dry-run && git pull --all --dry-run &&
test_path_is_missing .git/FETCH_HEAD && test_path_is_missing .git/FETCH_HEAD &&
test_path_is_missing .git/refs/remotes/origin/master && test_path_is_missing .git/refs/remotes/origin/main &&
test_path_is_missing .git/index && test_path_is_missing .git/index &&
test_path_is_missing file test_path_is_missing file
) )

32
t/t5523-push-upstream.sh
Просмотреть файл

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
test_description='push with --set-upstream' test_description='push with --set-upstream'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh . ./test-lib.sh
@ -29,19 +29,19 @@ check_config() {
test_cmp expect.$1 actual.$1 test_cmp expect.$1 actual.$1
} }
test_expect_success 'push -u master:master' ' test_expect_success 'push -u main:main' '
git push -u upstream master:master && git push -u upstream main:main &&
check_config master upstream refs/heads/master check_config main upstream refs/heads/main
' '
test_expect_success 'push -u master:other' ' test_expect_success 'push -u main:other' '
git push -u upstream master:other && git push -u upstream main:other &&
check_config master upstream refs/heads/other check_config main upstream refs/heads/other
' '
test_expect_success 'push -u --dry-run master:otherX' ' test_expect_success 'push -u --dry-run main:otherX' '
git push -u --dry-run upstream master:otherX && git push -u --dry-run upstream main:otherX &&
check_config master upstream refs/heads/other check_config main upstream refs/heads/other
' '
test_expect_success 'push -u topic_2:topic_2' ' test_expect_success 'push -u topic_2:topic_2' '
@ -77,7 +77,7 @@ test_expect_success 'push -u HEAD' '
test_expect_success TTY 'progress messages go to tty' ' test_expect_success TTY 'progress messages go to tty' '
ensure_fresh_upstream && ensure_fresh_upstream &&
test_terminal git push -u upstream master >out 2>err && test_terminal git push -u upstream main >out 2>err &&
test_i18ngrep "Writing objects" err test_i18ngrep "Writing objects" err
' '
@ -85,7 +85,7 @@ test_expect_success 'progress messages do not go to non-tty' '
ensure_fresh_upstream && ensure_fresh_upstream &&
# skip progress messages, since stderr is non-tty # skip progress messages, since stderr is non-tty
git push -u upstream master >out 2>err && git push -u upstream main >out 2>err &&
test_i18ngrep ! "Writing objects" err test_i18ngrep ! "Writing objects" err
' '
@ -93,21 +93,21 @@ test_expect_success 'progress messages go to non-tty (forced)' '
ensure_fresh_upstream && ensure_fresh_upstream &&
# force progress messages to stderr, even though it is non-tty # force progress messages to stderr, even though it is non-tty
git push -u --progress upstream master >out 2>err && git push -u --progress upstream main >out 2>err &&
test_i18ngrep "Writing objects" err test_i18ngrep "Writing objects" err
' '
test_expect_success TTY 'push -q suppresses progress' ' test_expect_success TTY 'push -q suppresses progress' '
ensure_fresh_upstream && ensure_fresh_upstream &&
test_terminal git push -u -q upstream master >out 2>err && test_terminal git push -u -q upstream main >out 2>err &&
test_i18ngrep ! "Writing objects" err test_i18ngrep ! "Writing objects" err
' '
test_expect_success TTY 'push --no-progress suppresses progress' ' test_expect_success TTY 'push --no-progress suppresses progress' '
ensure_fresh_upstream && ensure_fresh_upstream &&
test_terminal git push -u --no-progress upstream master >out 2>err && test_terminal git push -u --no-progress upstream main >out 2>err &&
test_i18ngrep ! "Unpacking objects" err && test_i18ngrep ! "Unpacking objects" err &&
test_i18ngrep ! "Writing objects" err test_i18ngrep ! "Writing objects" err
' '
@ -115,7 +115,7 @@ test_expect_success TTY 'push --no-progress suppresses progress' '
test_expect_success TTY 'quiet push' ' test_expect_success TTY 'quiet push' '
ensure_fresh_upstream && ensure_fresh_upstream &&
test_terminal git push --quiet --no-progress upstream master 2>&1 | tee output && test_terminal git push --quiet --no-progress upstream main 2>&1 | tee output &&
test_must_be_empty output test_must_be_empty output
' '

16
t/t5527-fetch-odd-refs.sh
Просмотреть файл

@ -1,20 +1,20 @@
#!/bin/sh #!/bin/sh
test_description='test fetching of oddly-named refs' test_description='test fetching of oddly-named refs'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh . ./test-lib.sh
# afterwards we will have: # afterwards we will have:
# HEAD - two # HEAD - two
# refs/for/refs/heads/master - one # refs/for/refs/heads/main - one
# refs/heads/master - three # refs/heads/main - three
test_expect_success 'setup repo with odd suffix ref' ' test_expect_success 'setup repo with odd suffix ref' '
echo content >file && echo content >file &&
git add . && git add . &&
git commit -m one && git commit -m one &&
git update-ref refs/for/refs/heads/master HEAD && git update-ref refs/for/refs/heads/main HEAD &&
echo content >>file && echo content >>file &&
git commit -a -m two && git commit -a -m two &&
echo content >>file && echo content >>file &&
@ -25,7 +25,7 @@ test_expect_success 'setup repo with odd suffix ref' '
test_expect_success 'suffix ref is ignored during fetch' ' test_expect_success 'suffix ref is ignored during fetch' '
git clone --bare file://"$PWD" suffix && git clone --bare file://"$PWD" suffix &&
echo three >expect && echo three >expect &&
git --git-dir=suffix log -1 --format=%s refs/heads/master >actual && git --git-dir=suffix log -1 --format=%s refs/heads/main >actual &&
test_cmp expect actual test_cmp expect actual
' '
@ -36,7 +36,7 @@ test_expect_success 'try to create repo with absurdly long refname' '
( (
cd long && cd long &&
test_commit long && test_commit long &&
test_commit master test_commit main
) && ) &&
if git -C long update-ref refs/heads/$ref1440 long; then if git -C long update-ref refs/heads/$ref1440 long; then
test_set_prereq LONG_REF test_set_prereq LONG_REF
@ -49,7 +49,7 @@ test_expect_success LONG_REF 'fetch handles extremely long refname' '
git fetch long refs/heads/*:refs/remotes/long/* && git fetch long refs/heads/*:refs/remotes/long/* &&
cat >expect <<-\EOF && cat >expect <<-\EOF &&
long long
master main
EOF EOF
git for-each-ref --format="%(subject)" refs/remotes/long >actual && git for-each-ref --format="%(subject)" refs/remotes/long >actual &&
test_cmp expect actual test_cmp expect actual
@ -58,7 +58,7 @@ test_expect_success LONG_REF 'fetch handles extremely long refname' '
test_expect_success LONG_REF 'push handles extremely long refname' ' test_expect_success LONG_REF 'push handles extremely long refname' '
git push long :refs/heads/$ref1440 && git push long :refs/heads/$ref1440 &&
git -C long for-each-ref --format="%(subject)" refs/heads >actual && git -C long for-each-ref --format="%(subject)" refs/heads >actual &&
echo master >expect && echo main >expect &&
test_cmp expect actual test_cmp expect actual
' '

100
t/t5528-push-default.sh
Просмотреть файл

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
test_description='check various push.default settings' test_description='check various push.default settings'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh . ./test-lib.sh
@ -44,7 +44,7 @@ test_push_failure () {
# $1 = success or failure # $1 = success or failure
# $2 = push.default value # $2 = push.default value
# $3 = branch to check for actual output (master or foo) # $3 = branch to check for actual output (main or foo)
# $4 = [optional] switch to triangular workflow # $4 = [optional] switch to triangular workflow
test_pushdefault_workflow () { test_pushdefault_workflow () {
workflow=central workflow=central
@ -54,8 +54,8 @@ test_pushdefault_workflow () {
pushdefault=parent2 pushdefault=parent2
fi fi
test_expect_success "push.default = $2 $1 in $workflow workflows" " test_expect_success "push.default = $2 $1 in $workflow workflows" "
test_config branch.master.remote parent1 && test_config branch.main.remote parent1 &&
test_config branch.master.merge refs/heads/foo && test_config branch.main.merge refs/heads/foo &&
test_config remote.pushdefault $pushdefault && test_config remote.pushdefault $pushdefault &&
test_commit commit-for-$2${4+-triangular} && test_commit commit-for-$2${4+-triangular} &&
test_push_$1 $2 $3 ${4+repo2} test_push_$1 $2 $3 ${4+repo2}
@ -63,32 +63,32 @@ test_pushdefault_workflow () {
} }
test_expect_success '"upstream" pushes to configured upstream' ' test_expect_success '"upstream" pushes to configured upstream' '
git checkout master && git checkout main &&
test_config branch.master.remote parent1 && test_config branch.main.remote parent1 &&
test_config branch.master.merge refs/heads/foo && test_config branch.main.merge refs/heads/foo &&
test_commit two && test_commit two &&
test_push_success upstream foo test_push_success upstream foo
' '
test_expect_success '"upstream" does not push on unconfigured remote' ' test_expect_success '"upstream" does not push on unconfigured remote' '
git checkout master && git checkout main &&
test_unconfig branch.master.remote && test_unconfig branch.main.remote &&
test_commit three && test_commit three &&
test_push_failure upstream test_push_failure upstream
' '
test_expect_success '"upstream" does not push on unconfigured branch' ' test_expect_success '"upstream" does not push on unconfigured branch' '
git checkout master && git checkout main &&
test_config branch.master.remote parent1 && test_config branch.main.remote parent1 &&
test_unconfig branch.master.merge && test_unconfig branch.main.merge &&
test_commit four && test_commit four &&
test_push_failure upstream test_push_failure upstream
' '
test_expect_success '"upstream" does not push when remotes do not match' ' test_expect_success '"upstream" does not push when remotes do not match' '
git checkout master && git checkout main &&
test_config branch.master.remote parent1 && test_config branch.main.remote parent1 &&
test_config branch.master.merge refs/heads/foo && test_config branch.main.merge refs/heads/foo &&
test_config push.default upstream && test_config push.default upstream &&
test_commit five && test_commit five &&
test_must_fail git push parent2 test_must_fail git push parent2
@ -124,99 +124,99 @@ test_expect_success 'push from/to new branch with current creates remote branch'
' '
test_expect_success 'push to existing branch, with no upstream configured' ' test_expect_success 'push to existing branch, with no upstream configured' '
test_config branch.master.remote repo1 && test_config branch.main.remote repo1 &&
git checkout master && git checkout main &&
test_push_failure simple && test_push_failure simple &&
test_push_failure upstream test_push_failure upstream
' '
test_expect_success 'push to existing branch, upstream configured with same name' ' test_expect_success 'push to existing branch, upstream configured with same name' '
test_config branch.master.remote repo1 && test_config branch.main.remote repo1 &&
test_config branch.master.merge refs/heads/master && test_config branch.main.merge refs/heads/main &&
git checkout master && git checkout main &&
test_commit six && test_commit six &&
test_push_success upstream master && test_push_success upstream main &&
test_commit seven && test_commit seven &&
test_push_success simple master test_push_success simple main
' '
test_expect_success 'push to existing branch, upstream configured with different name' ' test_expect_success 'push to existing branch, upstream configured with different name' '
test_config branch.master.remote repo1 && test_config branch.main.remote repo1 &&
test_config branch.master.merge refs/heads/other-name && test_config branch.main.merge refs/heads/other-name &&
git checkout master && git checkout main &&
test_commit eight && test_commit eight &&
test_push_success upstream other-name && test_push_success upstream other-name &&
test_commit nine && test_commit nine &&
test_push_failure simple && test_push_failure simple &&
git --git-dir=repo1 log -1 --format="%h %s" "other-name" >expect-other-name && git --git-dir=repo1 log -1 --format="%h %s" "other-name" >expect-other-name &&
test_push_success current master && test_push_success current main &&
git --git-dir=repo1 log -1 --format="%h %s" "other-name" >actual-other-name && git --git-dir=repo1 log -1 --format="%h %s" "other-name" >actual-other-name &&
test_cmp expect-other-name actual-other-name test_cmp expect-other-name actual-other-name
' '
# We are on 'master', which integrates with 'foo' from parent1 # We are on 'main', which integrates with 'foo' from parent1
# remote (set in test_pushdefault_workflow helper). Push to # remote (set in test_pushdefault_workflow helper). Push to
# parent1 in centralized, and push to parent2 in triangular workflow. # parent1 in centralized, and push to parent2 in triangular workflow.
# The parent1 repository has 'master' and 'foo' branches, while # The parent1 repository has 'main' and 'foo' branches, while
# the parent2 repository has only 'master' branch. # the parent2 repository has only 'main' branch.
# #
# test_pushdefault_workflow() arguments: # test_pushdefault_workflow() arguments:
# $1 = success or failure # $1 = success or failure
# $2 = push.default value # $2 = push.default value
# $3 = branch to check for actual output (master or foo) # $3 = branch to check for actual output (main or foo)
# $4 = [optional] switch to triangular workflow # $4 = [optional] switch to triangular workflow
# update parent1's master (which is not our upstream) # update parent1's main (which is not our upstream)
test_pushdefault_workflow success current master test_pushdefault_workflow success current main
# update parent1's foo (which is our upstream) # update parent1's foo (which is our upstream)
test_pushdefault_workflow success upstream foo test_pushdefault_workflow success upstream foo
# upstream is foo which is not the name of the current branch # upstream is foo which is not the name of the current branch
test_pushdefault_workflow failure simple master test_pushdefault_workflow failure simple main
# master and foo are updated # main and foo are updated
test_pushdefault_workflow success matching master test_pushdefault_workflow success matching main
# master is updated # main is updated
test_pushdefault_workflow success current master triangular test_pushdefault_workflow success current main triangular
# upstream mode cannot be used in triangular # upstream mode cannot be used in triangular
test_pushdefault_workflow failure upstream foo triangular test_pushdefault_workflow failure upstream foo triangular
# in triangular, 'simple' works as 'current' and update the branch # in triangular, 'simple' works as 'current' and update the branch
# with the same name. # with the same name.
test_pushdefault_workflow success simple master triangular test_pushdefault_workflow success simple main triangular
# master is updated (parent2 does not have foo) # main is updated (parent2 does not have foo)
test_pushdefault_workflow success matching master triangular test_pushdefault_workflow success matching main triangular
# default tests, when no push-default is specified. This # default tests, when no push-default is specified. This
# should behave the same as "simple" in non-triangular # should behave the same as "simple" in non-triangular
# settings, and as "current" otherwise. # settings, and as "current" otherwise.
test_expect_success 'default behavior allows "simple" push' ' test_expect_success 'default behavior allows "simple" push' '
test_config branch.master.remote parent1 && test_config branch.main.remote parent1 &&
test_config branch.master.merge refs/heads/master && test_config branch.main.merge refs/heads/main &&
test_config remote.pushdefault parent1 && test_config remote.pushdefault parent1 &&
test_commit default-master-master && test_commit default-main-main &&
test_push_success "" master test_push_success "" main
' '
test_expect_success 'default behavior rejects non-simple push' ' test_expect_success 'default behavior rejects non-simple push' '
test_config branch.master.remote parent1 && test_config branch.main.remote parent1 &&
test_config branch.master.merge refs/heads/foo && test_config branch.main.merge refs/heads/foo &&
test_config remote.pushdefault parent1 && test_config remote.pushdefault parent1 &&
test_commit default-master-foo && test_commit default-main-foo &&
test_push_failure "" test_push_failure ""
' '
test_expect_success 'default triangular behavior acts like "current"' ' test_expect_success 'default triangular behavior acts like "current"' '
test_config branch.master.remote parent1 && test_config branch.main.remote parent1 &&
test_config branch.master.merge refs/heads/foo && test_config branch.main.merge refs/heads/foo &&
test_config remote.pushdefault parent2 && test_config remote.pushdefault parent2 &&
test_commit default-triangular && test_commit default-triangular &&
test_push_success "" master repo2 test_push_success "" main repo2
' '
test_done test_done

2
t/t5529-push-errors.sh
Просмотреть файл

@ -32,7 +32,7 @@ test_expect_success 'detect missing branches early' '
test_expect_success 'detect missing sha1 expressions early' ' test_expect_success 'detect missing sha1 expressions early' '
echo no >rp-ran && echo no >rp-ran &&
echo no >expect && echo no >expect &&
test_must_fail git push origin master~2:master && test_must_fail git push origin main~2:main &&
test_cmp expect rp-ran test_cmp expect rp-ran
' '

2
t/t5530-upload-pack-error.sh
Просмотреть файл

@ -115,7 +115,7 @@ test_expect_success 'create empty repository' '
test_expect_success 'fetch fails' ' test_expect_success 'fetch fails' '
test_must_fail git fetch .. master test_must_fail git fetch .. main
' '

190
t/t5531-deep-submodule-push.sh
Просмотреть файл

@ -2,7 +2,7 @@
test_description='test push with submodules' test_description='test push with submodules'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh . ./test-lib.sh
@ -33,7 +33,7 @@ test_expect_success setup '
test_expect_success 'push works with recorded gitlink' ' test_expect_success 'push works with recorded gitlink' '
( (
cd work && cd work &&
git push ../pub.git master git push ../pub.git main
) )
' '
@ -48,7 +48,7 @@ test_expect_success 'push if submodule has no remote' '
cd work && cd work &&
git add gar/bage && git add gar/bage &&
git commit -m "Second commit for gar/bage" && git commit -m "Second commit for gar/bage" &&
git push --recurse-submodules=check ../pub.git master git push --recurse-submodules=check ../pub.git main
) )
' '
@ -69,21 +69,21 @@ test_expect_success 'push fails if submodule commit not on remote' '
git commit -m "Third commit for gar/bage" && git commit -m "Third commit for gar/bage" &&
# the push should fail with --recurse-submodules=check # the push should fail with --recurse-submodules=check
# on the command line... # on the command line...
test_must_fail git push --recurse-submodules=check ../pub.git master && test_must_fail git push --recurse-submodules=check ../pub.git main &&
# ...or if specified in the configuration.. # ...or if specified in the configuration..
test_must_fail git -c push.recurseSubmodules=check push ../pub.git master test_must_fail git -c push.recurseSubmodules=check push ../pub.git main
) )
' '
test_expect_success 'push succeeds after commit was pushed to remote' ' test_expect_success 'push succeeds after commit was pushed to remote' '
( (
cd work/gar/bage && cd work/gar/bage &&
git push origin master git push origin main
) && ) &&
( (
cd work && cd work &&
git push --recurse-submodules=check ../pub.git master git push --recurse-submodules=check ../pub.git main
) )
' '
@ -98,13 +98,13 @@ test_expect_success 'push succeeds if submodule commit not on remote but using o
cd work && cd work &&
git add gar/bage && git add gar/bage &&
git commit -m "Recurse on-demand on command line for gar/bage" && git commit -m "Recurse on-demand on command line for gar/bage" &&
git push --recurse-submodules=on-demand ../pub.git master && git push --recurse-submodules=on-demand ../pub.git main &&
# Check that the supermodule commit got there # Check that the supermodule commit got there
git fetch ../pub.git && git fetch ../pub.git &&
git diff --quiet FETCH_HEAD master && git diff --quiet FETCH_HEAD main &&
# Check that the submodule commit got there too # Check that the submodule commit got there too
cd gar/bage && cd gar/bage &&
git diff --quiet origin/master master git diff --quiet origin/main main
) )
' '
@ -119,13 +119,13 @@ test_expect_success 'push succeeds if submodule commit not on remote but using o
cd work && cd work &&
git add gar/bage && git add gar/bage &&
git commit -m "Recurse on-demand from config for gar/bage" && git commit -m "Recurse on-demand from config for gar/bage" &&
git -c push.recurseSubmodules=on-demand push ../pub.git master && git -c push.recurseSubmodules=on-demand push ../pub.git main &&
# Check that the supermodule commit got there # Check that the supermodule commit got there
git fetch ../pub.git && git fetch ../pub.git &&
git diff --quiet FETCH_HEAD master && git diff --quiet FETCH_HEAD main &&
# Check that the submodule commit got there too # Check that the submodule commit got there too
cd gar/bage && cd gar/bage &&
git diff --quiet origin/master master git diff --quiet origin/main main
) )
' '
@ -140,13 +140,13 @@ test_expect_success 'push succeeds if submodule commit not on remote but using a
cd work && cd work &&
git add gar/bage && git add gar/bage &&
git commit -m "Recurse submodule.recurse from config for gar/bage" && git commit -m "Recurse submodule.recurse from config for gar/bage" &&
git -c submodule.recurse push ../pub.git master && git -c submodule.recurse push ../pub.git main &&
# Check that the supermodule commit got there # Check that the supermodule commit got there
git fetch ../pub.git && git fetch ../pub.git &&
git diff --quiet FETCH_HEAD master && git diff --quiet FETCH_HEAD main &&
# Check that the submodule commit got there too # Check that the submodule commit got there too
cd gar/bage && cd gar/bage &&
git diff --quiet origin/master master git diff --quiet origin/main main
) )
' '
@ -164,34 +164,34 @@ test_expect_success 'push recurse-submodules on command line overrides config' '
# Ensure that we can override on-demand in the config # Ensure that we can override on-demand in the config
# to just check submodules # to just check submodules
test_must_fail git -c push.recurseSubmodules=on-demand push --recurse-submodules=check ../pub.git master && test_must_fail git -c push.recurseSubmodules=on-demand push --recurse-submodules=check ../pub.git main &&
# Check that the supermodule commit did not get there # Check that the supermodule commit did not get there
git fetch ../pub.git && git fetch ../pub.git &&
git diff --quiet FETCH_HEAD master^ && git diff --quiet FETCH_HEAD main^ &&
# Check that the submodule commit did not get there # Check that the submodule commit did not get there
(cd gar/bage && git diff --quiet origin/master master^) && (cd gar/bage && git diff --quiet origin/main main^) &&
# Ensure that we can override check in the config to # Ensure that we can override check in the config to
# disable submodule recursion entirely # disable submodule recursion entirely
(cd gar/bage && git diff --quiet origin/master master^) && (cd gar/bage && git diff --quiet origin/main main^) &&
git -c push.recurseSubmodules=on-demand push --recurse-submodules=no ../pub.git master && git -c push.recurseSubmodules=on-demand push --recurse-submodules=no ../pub.git main &&
git fetch ../pub.git && git fetch ../pub.git &&
git diff --quiet FETCH_HEAD master && git diff --quiet FETCH_HEAD main &&
(cd gar/bage && git diff --quiet origin/master master^) && (cd gar/bage && git diff --quiet origin/main main^) &&
# Ensure that we can override check in the config to # Ensure that we can override check in the config to
# disable submodule recursion entirely (alternative form) # disable submodule recursion entirely (alternative form)
git -c push.recurseSubmodules=on-demand push --no-recurse-submodules ../pub.git master && git -c push.recurseSubmodules=on-demand push --no-recurse-submodules ../pub.git main &&
git fetch ../pub.git && git fetch ../pub.git &&
git diff --quiet FETCH_HEAD master && git diff --quiet FETCH_HEAD main &&
(cd gar/bage && git diff --quiet origin/master master^) && (cd gar/bage && git diff --quiet origin/main main^) &&
# Ensure that we can override check in the config to # Ensure that we can override check in the config to
# push the submodule too # push the submodule too
git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git master && git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git main &&
git fetch ../pub.git && git fetch ../pub.git &&
git diff --quiet FETCH_HEAD master && git diff --quiet FETCH_HEAD main &&
(cd gar/bage && git diff --quiet origin/master master) (cd gar/bage && git diff --quiet origin/main main)
) )
' '
@ -208,31 +208,31 @@ test_expect_success 'push recurse-submodules last one wins on command line' '
git commit -m "Recurse on command-line overriding earlier command-line for gar/bage" && git commit -m "Recurse on command-line overriding earlier command-line for gar/bage" &&
# should result in "check" # should result in "check"
test_must_fail git push --recurse-submodules=on-demand --recurse-submodules=check ../pub.git master && test_must_fail git push --recurse-submodules=on-demand --recurse-submodules=check ../pub.git main &&
# Check that the supermodule commit did not get there # Check that the supermodule commit did not get there
git fetch ../pub.git && git fetch ../pub.git &&
git diff --quiet FETCH_HEAD master^ && git diff --quiet FETCH_HEAD main^ &&
# Check that the submodule commit did not get there # Check that the submodule commit did not get there
(cd gar/bage && git diff --quiet origin/master master^) && (cd gar/bage && git diff --quiet origin/main main^) &&
# should result in "no" # should result in "no"
git push --recurse-submodules=on-demand --recurse-submodules=no ../pub.git master && git push --recurse-submodules=on-demand --recurse-submodules=no ../pub.git main &&
# Check that the supermodule commit did get there # Check that the supermodule commit did get there
git fetch ../pub.git && git fetch ../pub.git &&
git diff --quiet FETCH_HEAD master && git diff --quiet FETCH_HEAD main &&
# Check that the submodule commit did not get there # Check that the submodule commit did not get there
(cd gar/bage && git diff --quiet origin/master master^) && (cd gar/bage && git diff --quiet origin/main main^) &&
# should result in "no" # should result in "no"
git push --recurse-submodules=on-demand --no-recurse-submodules ../pub.git master && git push --recurse-submodules=on-demand --no-recurse-submodules ../pub.git main &&
# Check that the submodule commit did not get there # Check that the submodule commit did not get there
(cd gar/bage && git diff --quiet origin/master master^) && (cd gar/bage && git diff --quiet origin/main main^) &&
# But the options in the other order should push the submodule # But the options in the other order should push the submodule
git push --recurse-submodules=check --recurse-submodules=on-demand ../pub.git master && git push --recurse-submodules=check --recurse-submodules=on-demand ../pub.git main &&
# Check that the submodule commit did get there # Check that the submodule commit did get there
git fetch ../pub.git && git fetch ../pub.git &&
(cd gar/bage && git diff --quiet origin/master master) (cd gar/bage && git diff --quiet origin/main main)
) )
' '
@ -247,13 +247,13 @@ test_expect_success 'push succeeds if submodule commit not on remote using on-de
cd work && cd work &&
git add gar/bage && git add gar/bage &&
git commit -m "Recurse on-demand on command-line overriding config for gar/bage" && git commit -m "Recurse on-demand on command-line overriding config for gar/bage" &&
git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git master && git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git main &&
# Check that the supermodule commit got there # Check that the supermodule commit got there
git fetch ../pub.git && git fetch ../pub.git &&
git diff --quiet FETCH_HEAD master && git diff --quiet FETCH_HEAD main &&
# Check that the submodule commit got there # Check that the submodule commit got there
cd gar/bage && cd gar/bage &&
git diff --quiet origin/master master git diff --quiet origin/main main
) )
' '
@ -268,14 +268,14 @@ test_expect_success 'push succeeds if submodule commit disabling recursion from
cd work && cd work &&
git add gar/bage && git add gar/bage &&
git commit -m "Recurse disable on command-line overriding config for gar/bage" && git commit -m "Recurse disable on command-line overriding config for gar/bage" &&
git -c push.recurseSubmodules=check push --recurse-submodules=no ../pub.git master && git -c push.recurseSubmodules=check push --recurse-submodules=no ../pub.git main &&
# Check that the supermodule commit got there # Check that the supermodule commit got there
git fetch ../pub.git && git fetch ../pub.git &&
git diff --quiet FETCH_HEAD master && git diff --quiet FETCH_HEAD main &&
# But that the submodule commit did not # But that the submodule commit did not
( cd gar/bage && git diff --quiet origin/master master^ ) && ( cd gar/bage && git diff --quiet origin/main main^ ) &&
# Now push it to avoid confusing future tests # Now push it to avoid confusing future tests
git push --recurse-submodules=on-demand ../pub.git master git push --recurse-submodules=on-demand ../pub.git main
) )
' '
@ -290,14 +290,14 @@ test_expect_success 'push succeeds if submodule commit disabling recursion from
cd work && cd work &&
git add gar/bage && git add gar/bage &&
git commit -m "Recurse disable on command-line alternative overriding config for gar/bage" && git commit -m "Recurse disable on command-line alternative overriding config for gar/bage" &&
git -c push.recurseSubmodules=check push --no-recurse-submodules ../pub.git master && git -c push.recurseSubmodules=check push --no-recurse-submodules ../pub.git main &&
# Check that the supermodule commit got there # Check that the supermodule commit got there
git fetch ../pub.git && git fetch ../pub.git &&
git diff --quiet FETCH_HEAD master && git diff --quiet FETCH_HEAD main &&
# But that the submodule commit did not # But that the submodule commit did not
( cd gar/bage && git diff --quiet origin/master master^ ) && ( cd gar/bage && git diff --quiet origin/main main^ ) &&
# Now push it to avoid confusing future tests # Now push it to avoid confusing future tests
git push --recurse-submodules=on-demand ../pub.git master git push --recurse-submodules=on-demand ../pub.git main
) )
' '
@ -307,7 +307,7 @@ test_expect_success 'submodule entry pointing at a tag is error' '
git -C work update-index --cacheinfo 160000 "$tag" gar/bage && git -C work update-index --cacheinfo 160000 "$tag" gar/bage &&
git -C work commit -m "bad commit" && git -C work commit -m "bad commit" &&
test_when_finished "git -C work reset --hard HEAD^" && test_when_finished "git -C work reset --hard HEAD^" &&
test_must_fail git -C work push --recurse-submodules=on-demand ../pub.git master 2>err && test_must_fail git -C work push --recurse-submodules=on-demand ../pub.git main 2>err &&
test_i18ngrep "is a tag, not a commit" err test_i18ngrep "is a tag, not a commit" err
' '
@ -322,9 +322,9 @@ test_expect_success 'push fails if recurse submodules option passed as yes' '
cd work && cd work &&
git add gar/bage && git add gar/bage &&
git commit -m "Recurse push fails if recurse submodules option passed as yes for gar/bage" && git commit -m "Recurse push fails if recurse submodules option passed as yes for gar/bage" &&
test_must_fail git push --recurse-submodules=yes ../pub.git master && test_must_fail git push --recurse-submodules=yes ../pub.git main &&
test_must_fail git -c push.recurseSubmodules=yes push ../pub.git master && test_must_fail git -c push.recurseSubmodules=yes push ../pub.git main &&
git push --recurse-submodules=on-demand ../pub.git master git push --recurse-submodules=on-demand ../pub.git main
) )
' '
@ -366,7 +366,7 @@ test_expect_success 'push succeeds if submodule has no remote and is on the firs
) && ) &&
git add b && git add b &&
git commit -m "added submodule" && git commit -m "added submodule" &&
git push --recurse-submodules=check origin master git push --recurse-submodules=check origin main
) )
' '
@ -375,21 +375,21 @@ test_expect_success 'push unpushed submodules when not needed' '
cd work && cd work &&
( (
cd gar/bage && cd gar/bage &&
git checkout master && git checkout main &&
>junk5 && >junk5 &&
git add junk5 && git add junk5 &&
git commit -m "Fifth junk" && git commit -m "Fifth junk" &&
git push && git push &&
git rev-parse origin/master >../../../expected git rev-parse origin/main >../../../expected
) && ) &&
git checkout master && git checkout main &&
git add gar/bage && git add gar/bage &&
git commit -m "Fifth commit for gar/bage" && git commit -m "Fifth commit for gar/bage" &&
git push --recurse-submodules=on-demand ../pub.git master git push --recurse-submodules=on-demand ../pub.git main
) && ) &&
( (
cd submodule.git && cd submodule.git &&
git rev-parse master >../actual git rev-parse main >../actual
) && ) &&
test_cmp expected actual test_cmp expected actual
' '
@ -397,7 +397,7 @@ test_expect_success 'push unpushed submodules when not needed' '
test_expect_success 'push unpushed submodules when not needed 2' ' test_expect_success 'push unpushed submodules when not needed 2' '
( (
cd submodule.git && cd submodule.git &&
git rev-parse master >../expected git rev-parse main >../expected
) && ) &&
( (
cd work && cd work &&
@ -410,11 +410,11 @@ test_expect_success 'push unpushed submodules when not needed 2' '
>junk2 && >junk2 &&
git add junk2 && git add junk2 &&
git commit -m "Second junk for work" && git commit -m "Second junk for work" &&
git push --recurse-submodules=on-demand ../pub.git master git push --recurse-submodules=on-demand ../pub.git main
) && ) &&
( (
cd submodule.git && cd submodule.git &&
git rev-parse master >../actual git rev-parse main >../actual
) && ) &&
test_cmp expected actual test_cmp expected actual
' '
@ -424,20 +424,20 @@ test_expect_success 'push unpushed submodules recursively' '
cd work && cd work &&
( (
cd gar/bage && cd gar/bage &&
git checkout master && git checkout main &&
> junk7 && > junk7 &&
git add junk7 && git add junk7 &&
git commit -m "Seventh junk" && git commit -m "Seventh junk" &&
git rev-parse master >../../../expected git rev-parse main >../../../expected
) && ) &&
git checkout master && git checkout main &&
git add gar/bage && git add gar/bage &&
git commit -m "Seventh commit for gar/bage" && git commit -m "Seventh commit for gar/bage" &&
git push --recurse-submodules=on-demand ../pub.git master git push --recurse-submodules=on-demand ../pub.git main
) && ) &&
( (
cd submodule.git && cd submodule.git &&
git rev-parse master >../actual git rev-parse main >../actual
) && ) &&
test_cmp expected actual test_cmp expected actual
' '
@ -447,64 +447,64 @@ test_expect_success 'push unpushable submodule recursively fails' '
cd work && cd work &&
( (
cd gar/bage && cd gar/bage &&
git rev-parse origin/master >../../../expected && git rev-parse origin/main >../../../expected &&
git checkout master~0 && git checkout main~0 &&
> junk8 && > junk8 &&
git add junk8 && git add junk8 &&
git commit -m "Eighth junk" git commit -m "Eighth junk"
) && ) &&
git add gar/bage && git add gar/bage &&
git commit -m "Eighth commit for gar/bage" && git commit -m "Eighth commit for gar/bage" &&
test_must_fail git push --recurse-submodules=on-demand ../pub.git master test_must_fail git push --recurse-submodules=on-demand ../pub.git main
) && ) &&
( (
cd submodule.git && cd submodule.git &&
git rev-parse master >../actual git rev-parse main >../actual
) && ) &&
test_when_finished git -C work reset --hard master^ && test_when_finished git -C work reset --hard main^ &&
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'push --dry-run does not recursively update submodules' ' test_expect_success 'push --dry-run does not recursively update submodules' '
( (
cd work/gar/bage && cd work/gar/bage &&
git checkout master && git checkout main &&
git rev-parse master >../../../expected_submodule && git rev-parse main >../../../expected_submodule &&
> junk9 && > junk9 &&
git add junk9 && git add junk9 &&
git commit -m "Ninth junk" && git commit -m "Ninth junk" &&
# Go up to 'work' directory # Go up to 'work' directory
cd ../.. && cd ../.. &&
git checkout master && git checkout main &&
git rev-parse master >../expected_pub && git rev-parse main >../expected_pub &&
git add gar/bage && git add gar/bage &&
git commit -m "Ninth commit for gar/bage" && git commit -m "Ninth commit for gar/bage" &&
git push --dry-run --recurse-submodules=on-demand ../pub.git master git push --dry-run --recurse-submodules=on-demand ../pub.git main
) && ) &&
git -C submodule.git rev-parse master >actual_submodule && git -C submodule.git rev-parse main >actual_submodule &&
git -C pub.git rev-parse master >actual_pub && git -C pub.git rev-parse main >actual_pub &&
test_cmp expected_pub actual_pub && test_cmp expected_pub actual_pub &&
test_cmp expected_submodule actual_submodule test_cmp expected_submodule actual_submodule
' '
test_expect_success 'push --dry-run does not recursively update submodules' ' test_expect_success 'push --dry-run does not recursively update submodules' '
git -C work push --dry-run --recurse-submodules=only ../pub.git master && git -C work push --dry-run --recurse-submodules=only ../pub.git main &&
git -C submodule.git rev-parse master >actual_submodule && git -C submodule.git rev-parse main >actual_submodule &&
git -C pub.git rev-parse master >actual_pub && git -C pub.git rev-parse main >actual_pub &&
test_cmp expected_pub actual_pub && test_cmp expected_pub actual_pub &&
test_cmp expected_submodule actual_submodule test_cmp expected_submodule actual_submodule
' '
test_expect_success 'push only unpushed submodules recursively' ' test_expect_success 'push only unpushed submodules recursively' '
git -C work/gar/bage rev-parse master >expected_submodule && git -C work/gar/bage rev-parse main >expected_submodule &&
git -C pub.git rev-parse master >expected_pub && git -C pub.git rev-parse main >expected_pub &&
git -C work push --recurse-submodules=only ../pub.git master && git -C work push --recurse-submodules=only ../pub.git main &&
git -C submodule.git rev-parse master >actual_submodule && git -C submodule.git rev-parse main >actual_submodule &&
git -C pub.git rev-parse master >actual_pub && git -C pub.git rev-parse main >actual_pub &&
test_cmp expected_submodule actual_submodule && test_cmp expected_submodule actual_submodule &&
test_cmp expected_pub actual_pub test_cmp expected_pub actual_pub
' '
@ -520,14 +520,14 @@ test_expect_success 'push propagating the remotes name to a submodule' '
git -C work commit -m "Tenth junk added to gar/bage" && git -C work commit -m "Tenth junk added to gar/bage" &&
# Fails when submodule does not have a matching remote # Fails when submodule does not have a matching remote
test_must_fail git -C work push --recurse-submodules=on-demand pub master && test_must_fail git -C work push --recurse-submodules=on-demand pub main &&
# Succeeds when submodules has matching remote and refspec # Succeeds when submodules has matching remote and refspec
git -C work push --recurse-submodules=on-demand origin master && git -C work push --recurse-submodules=on-demand origin main &&
git -C submodule.git rev-parse master >actual_submodule && git -C submodule.git rev-parse main >actual_submodule &&
git -C pub.git rev-parse master >actual_pub && git -C pub.git rev-parse main >actual_pub &&
git -C work/gar/bage rev-parse master >expected_submodule && git -C work/gar/bage rev-parse main >expected_submodule &&
git -C work rev-parse master >expected_pub && git -C work rev-parse main >expected_pub &&
test_cmp expected_submodule actual_submodule && test_cmp expected_submodule actual_submodule &&
test_cmp expected_pub actual_pub test_cmp expected_pub actual_pub
' '
@ -551,7 +551,7 @@ test_expect_success 'push propagating refspec to a submodule' '
test_must_fail git -C work push --recurse-submodules=on-demand origin \ test_must_fail git -C work push --recurse-submodules=on-demand origin \
HEAD:refs/heads/branch2 && HEAD:refs/heads/branch2 &&
git -C work/gar/bage branch branch2 master && git -C work/gar/bage branch branch2 main &&
git -C work push --recurse-submodules=on-demand origin branch2 && git -C work push --recurse-submodules=on-demand origin branch2 &&
git -C submodule.git rev-parse branch2 >actual_submodule && git -C submodule.git rev-parse branch2 >actual_submodule &&

144
t/t5533-push-cas.sh
Просмотреть файл

@ -2,7 +2,7 @@
test_description='compare & swap push force/delete safety' test_description='compare & swap push force/delete safety'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh . ./test-lib.sh
@ -32,22 +32,22 @@ setup_src_dup_dst () {
( (
cd dup && cd dup &&
git fetch && git fetch &&
git merge origin/master && git merge origin/main &&
git switch -c branch master~2 && git switch -c branch main~2 &&
test_commit D && test_commit D &&
test_commit E && test_commit E &&
git push origin --all git push origin --all
) && ) &&
( (
cd src && cd src &&
git switch master && git switch main &&
git fetch --all && git fetch --all &&
git branch branch --track origin/branch && git branch branch --track origin/branch &&
git rebase origin/master git rebase origin/main
) && ) &&
( (
cd dup && cd dup &&
git switch master && git switch main &&
test_commit F && test_commit F &&
test_commit G && test_commit G &&
git switch branch && git switch branch &&
@ -68,11 +68,11 @@ test_expect_success 'push to update (protected)' '
( (
cd dst && cd dst &&
test_commit D && test_commit D &&
test_must_fail git push --force-with-lease=master:master origin master 2>err && test_must_fail git push --force-with-lease=main:main origin main 2>err &&
grep "stale info" err grep "stale info" err
) && ) &&
git ls-remote . refs/heads/master >expect && git ls-remote . refs/heads/main >expect &&
git ls-remote src refs/heads/master >actual && git ls-remote src refs/heads/main >actual &&
test_cmp expect actual test_cmp expect actual
' '
@ -81,11 +81,11 @@ test_expect_success 'push to update (protected, forced)' '
( (
cd dst && cd dst &&
test_commit D && test_commit D &&
git push --force --force-with-lease=master:master origin master 2>err && git push --force --force-with-lease=main:main origin main 2>err &&
grep "forced update" err grep "forced update" err
) && ) &&
git ls-remote dst refs/heads/master >expect && git ls-remote dst refs/heads/main >expect &&
git ls-remote src refs/heads/master >actual && git ls-remote src refs/heads/main >actual &&
test_cmp expect actual test_cmp expect actual
' '
@ -93,20 +93,20 @@ test_expect_success 'push to update (protected, tracking)' '
setup_srcdst_basic && setup_srcdst_basic &&
( (
cd src && cd src &&
git checkout master && git checkout main &&
test_commit D && test_commit D &&
git checkout HEAD^0 git checkout HEAD^0
) && ) &&
git ls-remote src refs/heads/master >expect && git ls-remote src refs/heads/main >expect &&
( (
cd dst && cd dst &&
test_commit E && test_commit E &&
git ls-remote . refs/remotes/origin/master >expect && git ls-remote . refs/remotes/origin/main >expect &&
test_must_fail git push --force-with-lease=master origin master && test_must_fail git push --force-with-lease=main origin main &&
git ls-remote . refs/remotes/origin/master >actual && git ls-remote . refs/remotes/origin/main >actual &&
test_cmp expect actual test_cmp expect actual
) && ) &&
git ls-remote src refs/heads/master >actual && git ls-remote src refs/heads/main >actual &&
test_cmp expect actual test_cmp expect actual
' '
@ -114,18 +114,18 @@ test_expect_success 'push to update (protected, tracking, forced)' '
setup_srcdst_basic && setup_srcdst_basic &&
( (
cd src && cd src &&
git checkout master && git checkout main &&
test_commit D && test_commit D &&
git checkout HEAD^0 git checkout HEAD^0
) && ) &&
( (
cd dst && cd dst &&
test_commit E && test_commit E &&
git ls-remote . refs/remotes/origin/master >expect && git ls-remote . refs/remotes/origin/main >expect &&
git push --force --force-with-lease=master origin master git push --force --force-with-lease=main origin main
) && ) &&
git ls-remote dst refs/heads/master >expect && git ls-remote dst refs/heads/main >expect &&
git ls-remote src refs/heads/master >actual && git ls-remote src refs/heads/main >actual &&
test_cmp expect actual test_cmp expect actual
' '
@ -134,10 +134,10 @@ test_expect_success 'push to update (allowed)' '
( (
cd dst && cd dst &&
test_commit D && test_commit D &&
git push --force-with-lease=master:master^ origin master git push --force-with-lease=main:main^ origin main
) && ) &&
git ls-remote dst refs/heads/master >expect && git ls-remote dst refs/heads/main >expect &&
git ls-remote src refs/heads/master >actual && git ls-remote src refs/heads/main >actual &&
test_cmp expect actual test_cmp expect actual
' '
@ -146,11 +146,11 @@ test_expect_success 'push to update (allowed, tracking)' '
( (
cd dst && cd dst &&
test_commit D && test_commit D &&
git push --force-with-lease=master origin master 2>err && git push --force-with-lease=main origin main 2>err &&
! grep "forced update" err ! grep "forced update" err
) && ) &&
git ls-remote dst refs/heads/master >expect && git ls-remote dst refs/heads/main >expect &&
git ls-remote src refs/heads/master >actual && git ls-remote src refs/heads/main >actual &&
test_cmp expect actual test_cmp expect actual
' '
@ -160,22 +160,22 @@ test_expect_success 'push to update (allowed even though no-ff)' '
cd dst && cd dst &&
git reset --hard HEAD^ && git reset --hard HEAD^ &&
test_commit D && test_commit D &&
git push --force-with-lease=master origin master 2>err && git push --force-with-lease=main origin main 2>err &&
grep "forced update" err grep "forced update" err
) && ) &&
git ls-remote dst refs/heads/master >expect && git ls-remote dst refs/heads/main >expect &&
git ls-remote src refs/heads/master >actual && git ls-remote src refs/heads/main >actual &&
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'push to delete (protected)' ' test_expect_success 'push to delete (protected)' '
setup_srcdst_basic && setup_srcdst_basic &&
git ls-remote src refs/heads/master >expect && git ls-remote src refs/heads/main >expect &&
( (
cd dst && cd dst &&
test_must_fail git push --force-with-lease=master:master^ origin :master test_must_fail git push --force-with-lease=main:main^ origin :main
) && ) &&
git ls-remote src refs/heads/master >actual && git ls-remote src refs/heads/main >actual &&
test_cmp expect actual test_cmp expect actual
' '
@ -183,9 +183,9 @@ test_expect_success 'push to delete (protected, forced)' '
setup_srcdst_basic && setup_srcdst_basic &&
( (
cd dst && cd dst &&
git push --force --force-with-lease=master:master^ origin :master git push --force --force-with-lease=main:main^ origin :main
) && ) &&
git ls-remote src refs/heads/master >actual && git ls-remote src refs/heads/main >actual &&
test_must_be_empty actual test_must_be_empty actual
' '
@ -193,10 +193,10 @@ test_expect_success 'push to delete (allowed)' '
setup_srcdst_basic && setup_srcdst_basic &&
( (
cd dst && cd dst &&
git push --force-with-lease=master origin :master 2>err && git push --force-with-lease=main origin :main 2>err &&
grep deleted err grep deleted err
) && ) &&
git ls-remote src refs/heads/master >actual && git ls-remote src refs/heads/main >actual &&
test_must_be_empty actual test_must_be_empty actual
' '
@ -204,12 +204,12 @@ test_expect_success 'cover everything with default force-with-lease (protected)'
setup_srcdst_basic && setup_srcdst_basic &&
( (
cd src && cd src &&
git branch naster master^ git branch nain main^
) && ) &&
git ls-remote src refs/heads/\* >expect && git ls-remote src refs/heads/\* >expect &&
( (
cd dst && cd dst &&
test_must_fail git push --force-with-lease origin master master:naster test_must_fail git push --force-with-lease origin main main:nain
) && ) &&
git ls-remote src refs/heads/\* >actual && git ls-remote src refs/heads/\* >actual &&
test_cmp expect actual test_cmp expect actual
@ -219,16 +219,16 @@ test_expect_success 'cover everything with default force-with-lease (allowed)' '
setup_srcdst_basic && setup_srcdst_basic &&
( (
cd src && cd src &&
git branch naster master^ git branch nain main^
) && ) &&
( (
cd dst && cd dst &&
git fetch && git fetch &&
git push --force-with-lease origin master master:naster git push --force-with-lease origin main main:nain
) && ) &&
git ls-remote dst refs/heads/master | git ls-remote dst refs/heads/main |
sed -e "s/master/naster/" >expect && sed -e "s/main/nain/" >expect &&
git ls-remote src refs/heads/naster >actual && git ls-remote src refs/heads/nain >actual &&
test_cmp expect actual test_cmp expect actual
' '
@ -236,7 +236,7 @@ test_expect_success 'new branch covered by force-with-lease' '
setup_srcdst_basic && setup_srcdst_basic &&
( (
cd dst && cd dst &&
git branch branch master && git branch branch main &&
git push --force-with-lease=branch origin branch git push --force-with-lease=branch origin branch
) && ) &&
git ls-remote dst refs/heads/branch >expect && git ls-remote dst refs/heads/branch >expect &&
@ -248,7 +248,7 @@ test_expect_success 'new branch covered by force-with-lease (explicit)' '
setup_srcdst_basic && setup_srcdst_basic &&
( (
cd dst && cd dst &&
git branch branch master && git branch branch main &&
git push --force-with-lease=branch: origin branch git push --force-with-lease=branch: origin branch
) && ) &&
git ls-remote dst refs/heads/branch >expect && git ls-remote dst refs/heads/branch >expect &&
@ -260,12 +260,12 @@ test_expect_success 'new branch already exists' '
setup_srcdst_basic && setup_srcdst_basic &&
( (
cd src && cd src &&
git checkout -b branch master && git checkout -b branch main &&
test_commit F test_commit F
) && ) &&
( (
cd dst && cd dst &&
git branch branch master && git branch branch main &&
test_must_fail git push --force-with-lease=branch: origin branch test_must_fail git push --force-with-lease=branch: origin branch
) )
' '
@ -280,7 +280,7 @@ test_expect_success 'background updates of REMOTE can be mitigated with a non-up
cd dst && cd dst &&
test_commit G && test_commit G &&
git remote add origin-push ../src.bare && git remote add origin-push ../src.bare &&
git push origin-push master:master git push origin-push main:main
) && ) &&
git clone --no-local src.bare dst2 && git clone --no-local src.bare dst2 &&
test_when_finished "rm -rf dst2" && test_when_finished "rm -rf dst2" &&
@ -302,58 +302,58 @@ test_expect_success 'background updates of REMOTE can be mitigated with a non-up
test_expect_success 'background updates to remote can be mitigated with "--force-if-includes"' ' test_expect_success 'background updates to remote can be mitigated with "--force-if-includes"' '
setup_src_dup_dst && setup_src_dup_dst &&
test_when_finished "rm -fr dst src dup" && test_when_finished "rm -fr dst src dup" &&
git ls-remote dst refs/heads/master >expect.master && git ls-remote dst refs/heads/main >expect.main &&
git ls-remote dst refs/heads/branch >expect.branch && git ls-remote dst refs/heads/branch >expect.branch &&
( (
cd src && cd src &&
git switch branch && git switch branch &&
test_commit I && test_commit I &&
git switch master && git switch main &&
test_commit J && test_commit J &&
git fetch --all && git fetch --all &&
test_must_fail git push --force-with-lease --force-if-includes --all test_must_fail git push --force-with-lease --force-if-includes --all
) && ) &&
git ls-remote dst refs/heads/master >actual.master && git ls-remote dst refs/heads/main >actual.main &&
git ls-remote dst refs/heads/branch >actual.branch && git ls-remote dst refs/heads/branch >actual.branch &&
test_cmp expect.master actual.master && test_cmp expect.main actual.main &&
test_cmp expect.branch actual.branch test_cmp expect.branch actual.branch
' '
test_expect_success 'background updates to remote can be mitigated with "push.useForceIfIncludes"' ' test_expect_success 'background updates to remote can be mitigated with "push.useForceIfIncludes"' '
setup_src_dup_dst && setup_src_dup_dst &&
test_when_finished "rm -fr dst src dup" && test_when_finished "rm -fr dst src dup" &&
git ls-remote dst refs/heads/master >expect.master && git ls-remote dst refs/heads/main >expect.main &&
( (
cd src && cd src &&
git switch branch && git switch branch &&
test_commit I && test_commit I &&
git switch master && git switch main &&
test_commit J && test_commit J &&
git fetch --all && git fetch --all &&
git config --local push.useForceIfIncludes true && git config --local push.useForceIfIncludes true &&
test_must_fail git push --force-with-lease=master origin master test_must_fail git push --force-with-lease=main origin main
) && ) &&
git ls-remote dst refs/heads/master >actual.master && git ls-remote dst refs/heads/main >actual.main &&
test_cmp expect.master actual.master test_cmp expect.main actual.main
' '
test_expect_success '"--force-if-includes" should be disabled for --force-with-lease="<refname>:<expect>"' ' test_expect_success '"--force-if-includes" should be disabled for --force-with-lease="<refname>:<expect>"' '
setup_src_dup_dst && setup_src_dup_dst &&
test_when_finished "rm -fr dst src dup" && test_when_finished "rm -fr dst src dup" &&
git ls-remote dst refs/heads/master >expect.master && git ls-remote dst refs/heads/main >expect.main &&
( (
cd src && cd src &&
git switch branch && git switch branch &&
test_commit I && test_commit I &&
git switch master && git switch main &&
test_commit J && test_commit J &&
remote_head="$(git rev-parse refs/remotes/origin/master)" && remote_head="$(git rev-parse refs/remotes/origin/main)" &&
git fetch --all && git fetch --all &&
test_must_fail git push --force-if-includes --force-with-lease="master:$remote_head" 2>err && test_must_fail git push --force-if-includes --force-with-lease="main:$remote_head" 2>err &&
grep "stale info" err grep "stale info" err
) && ) &&
git ls-remote dst refs/heads/master >actual.master && git ls-remote dst refs/heads/main >actual.main &&
test_cmp expect.master actual.master test_cmp expect.main actual.main
' '
test_expect_success '"--force-if-includes" should allow forced update after a rebase ("pull --rebase")' ' test_expect_success '"--force-if-includes" should allow forced update after a rebase ("pull --rebase")' '
@ -363,10 +363,10 @@ test_expect_success '"--force-if-includes" should allow forced update after a re
cd src && cd src &&
git switch branch && git switch branch &&
test_commit I && test_commit I &&
git switch master && git switch main &&
test_commit J && test_commit J &&
git pull --rebase origin master && git pull --rebase origin main &&
git push --force-if-includes --force-with-lease="master" git push --force-if-includes --force-with-lease="main"
) )
' '
@ -377,11 +377,11 @@ test_expect_success '"--force-if-includes" should allow forced update after a re
cd src && cd src &&
git switch branch && git switch branch &&
test_commit I && test_commit I &&
git switch master && git switch main &&
test_commit J && test_commit J &&
git pull --rebase origin master && git pull --rebase origin main &&
git rebase --onto HEAD~4 HEAD~1 && git rebase --onto HEAD~4 HEAD~1 &&
git push --force-if-includes --force-with-lease="master" git push --force-if-includes --force-with-lease="main"
) )
' '

6
t/t5534-push-signed.sh
Просмотреть файл

@ -2,7 +2,7 @@
test_description='signed push' test_description='signed push'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh . ./test-lib.sh
@ -12,11 +12,11 @@ prepare_dst () {
rm -fr dst && rm -fr dst &&
test_create_repo dst && test_create_repo dst &&
git push dst master:noop master:ff master:noff git push dst main:noop main:ff main:noff
} }
test_expect_success setup ' test_expect_success setup '
# master, ff and noff branches pointing at the same commit # main, ff and noff branches pointing at the same commit
test_tick && test_tick &&
git commit --allow-empty -m initial && git commit --allow-empty -m initial &&

32
t/t5537-fetch-shallow.sh
Просмотреть файл

@ -2,7 +2,7 @@
test_description='fetch/clone from a shallow clone' test_description='fetch/clone from a shallow clone'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh . ./test-lib.sh
@ -52,7 +52,7 @@ test_expect_success 'fetch from shallow clone' '
cd shallow2 && cd shallow2 &&
git fetch && git fetch &&
git fsck && git fsck &&
git log --format=%s origin/master >actual && git log --format=%s origin/main >actual &&
test_write_lines 5 4 3 >expect && test_write_lines 5 4 3 >expect &&
test_cmp expect actual test_cmp expect actual
) )
@ -67,7 +67,7 @@ test_expect_success 'fetch --depth from shallow clone' '
cd shallow2 && cd shallow2 &&
git fetch --depth=2 && git fetch --depth=2 &&
git fsck && git fsck &&
git log --format=%s origin/master >actual && git log --format=%s origin/main >actual &&
test_write_lines 6 5 >expect && test_write_lines 6 5 >expect &&
test_cmp expect actual test_cmp expect actual
) )
@ -78,7 +78,7 @@ test_expect_success 'fetch --unshallow from shallow clone' '
cd shallow2 && cd shallow2 &&
git fetch --unshallow && git fetch --unshallow &&
git fsck && git fsck &&
git log --format=%s origin/master >actual && git log --format=%s origin/main >actual &&
test_write_lines 6 5 4 3 >expect && test_write_lines 6 5 4 3 >expect &&
test_cmp expect actual test_cmp expect actual
) )
@ -92,7 +92,7 @@ test_expect_success 'fetch --unshallow from a full clone' '
test_write_lines 4 3 >expect && test_write_lines 4 3 >expect &&
test_cmp expect actual && test_cmp expect actual &&
git -c fetch.writeCommitGraph fetch --unshallow && git -c fetch.writeCommitGraph fetch --unshallow &&
git log origin/master --format=%s >actual && git log origin/main --format=%s >actual &&
test_write_lines 4 3 2 1 >expect && test_write_lines 4 3 2 1 >expect &&
test_cmp expect actual test_cmp expect actual
) )
@ -107,9 +107,9 @@ test_expect_success 'fetch something upstream has but hidden by clients shallow
git commit -m add-1-back && git commit -m add-1-back &&
( (
cd shallow2 && cd shallow2 &&
git fetch ../.git +refs/heads/master:refs/remotes/top/master && git fetch ../.git +refs/heads/main:refs/remotes/top/main &&
git fsck && git fsck &&
git log --format=%s top/master >actual && git log --format=%s top/main >actual &&
test_write_lines add-1-back 4 3 >expect && test_write_lines add-1-back 4 3 >expect &&
test_cmp expect actual test_cmp expect actual
) && ) &&
@ -138,7 +138,7 @@ test_expect_success 'fetch that requires changes in .git/shallow is filtered' '
test_expect_success 'fetch --update-shallow' ' test_expect_success 'fetch --update-shallow' '
( (
cd shallow && cd shallow &&
git checkout master && git checkout main &&
commit 7 && commit 7 &&
git tag -m foo heavy-tag HEAD^ && git tag -m foo heavy-tag HEAD^ &&
git tag light-tag HEAD^:tracked git tag light-tag HEAD^:tracked
@ -149,13 +149,13 @@ test_expect_success 'fetch --update-shallow' '
git fsck && git fsck &&
git for-each-ref --sort=refname --format="%(refname)" >actual.refs && git for-each-ref --sort=refname --format="%(refname)" >actual.refs &&
cat <<-\EOF >expect.refs && cat <<-\EOF >expect.refs &&
refs/remotes/shallow/master refs/remotes/shallow/main
refs/remotes/shallow/no-shallow refs/remotes/shallow/no-shallow
refs/tags/heavy-tag refs/tags/heavy-tag
refs/tags/light-tag refs/tags/light-tag
EOF EOF
test_cmp expect.refs actual.refs && test_cmp expect.refs actual.refs &&
git log --format=%s shallow/master >actual && git log --format=%s shallow/main >actual &&
test_write_lines 7 6 5 4 3 >expect && test_write_lines 7 6 5 4 3 >expect &&
test_cmp expect actual test_cmp expect actual
) )
@ -164,7 +164,7 @@ test_expect_success 'fetch --update-shallow' '
test_expect_success 'fetch --update-shallow (with fetch.writeCommitGraph)' ' test_expect_success 'fetch --update-shallow (with fetch.writeCommitGraph)' '
( (
cd shallow && cd shallow &&
git checkout master && git checkout main &&
commit 8 && commit 8 &&
git tag -m foo heavy-tag-for-graph HEAD^ && git tag -m foo heavy-tag-for-graph HEAD^ &&
git tag light-tag-for-graph HEAD^:tracked git tag light-tag-for-graph HEAD^:tracked
@ -176,7 +176,7 @@ test_expect_success 'fetch --update-shallow (with fetch.writeCommitGraph)' '
git fsck && git fsck &&
git for-each-ref --sort=refname --format="%(refname)" >actual.refs && git for-each-ref --sort=refname --format="%(refname)" >actual.refs &&
cat <<-EOF >expect.refs && cat <<-EOF >expect.refs &&
refs/remotes/shallow/master refs/remotes/shallow/main
refs/remotes/shallow/no-shallow refs/remotes/shallow/no-shallow
refs/tags/heavy-tag refs/tags/heavy-tag
refs/tags/heavy-tag-for-graph refs/tags/heavy-tag-for-graph
@ -184,7 +184,7 @@ test_expect_success 'fetch --update-shallow (with fetch.writeCommitGraph)' '
refs/tags/light-tag-for-graph refs/tags/light-tag-for-graph
EOF EOF
test_cmp expect.refs actual.refs && test_cmp expect.refs actual.refs &&
git log --format=%s shallow/master >actual && git log --format=%s shallow/main >actual &&
test_write_lines 8 7 6 5 4 3 >expect && test_write_lines 8 7 6 5 4 3 >expect &&
test_cmp expect actual test_cmp expect actual
) )
@ -209,7 +209,7 @@ test_expect_success '.git/shallow is edited by repack' '
test_commit -C shallow-server E && test_commit -C shallow-server E &&
test_commit -C shallow-server D && test_commit -C shallow-server D &&
d="$(git -C shallow-server rev-parse --verify D^0)" && d="$(git -C shallow-server rev-parse --verify D^0)" &&
git -C shallow-server checkout master && git -C shallow-server checkout main &&
git clone --depth=1 --no-tags --no-single-branch \ git clone --depth=1 --no-tags --no-single-branch \
"file://$PWD/shallow-server" shallow-client && "file://$PWD/shallow-server" shallow-client &&
@ -247,7 +247,7 @@ test_expect_success 'shallow fetches check connectivity before writing shallow f
git -C "$REPO" config protocol.version 2 && git -C "$REPO" config protocol.version 2 &&
git -C client config protocol.version 2 && git -C client config protocol.version 2 &&
git -C client fetch --depth=2 "$HTTPD_URL/one_time_perl/repo" master:a_branch && git -C client fetch --depth=2 "$HTTPD_URL/one_time_perl/repo" main:a_branch &&
# Craft a situation in which the server sends back an unshallow request # Craft a situation in which the server sends back an unshallow request
# with an empty packfile. This is done by refetching with a shorter # with an empty packfile. This is done by refetching with a shorter
@ -259,7 +259,7 @@ test_expect_success 'shallow fetches check connectivity before writing shallow f
>"$HTTPD_ROOT_PATH/one-time-perl" && >"$HTTPD_ROOT_PATH/one-time-perl" &&
test_must_fail env GIT_TEST_SIDEBAND_ALL=0 git -C client \ test_must_fail env GIT_TEST_SIDEBAND_ALL=0 git -C client \
fetch --depth=1 "$HTTPD_URL/one_time_perl/repo" \ fetch --depth=1 "$HTTPD_URL/one_time_perl/repo" \
master:a_branch && main:a_branch &&
# Ensure that the one-time-perl script was used. # Ensure that the one-time-perl script was used.
! test -e "$HTTPD_ROOT_PATH/one-time-perl" && ! test -e "$HTTPD_ROOT_PATH/one-time-perl" &&

24
t/t5538-push-shallow.sh
Просмотреть файл

@ -2,7 +2,7 @@
test_description='push from/to a shallow clone' test_description='push from/to a shallow clone'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh . ./test-lib.sh
@ -47,9 +47,9 @@ test_expect_success 'push from shallow clone' '
( (
cd shallow && cd shallow &&
commit 5 && commit 5 &&
git push ../.git +master:refs/remotes/shallow/master git push ../.git +main:refs/remotes/shallow/main
) && ) &&
git log --format=%s shallow/master >actual && git log --format=%s shallow/main >actual &&
git fsck && git fsck &&
cat <<EOF >expect && cat <<EOF >expect &&
5 5
@ -64,10 +64,10 @@ EOF
test_expect_success 'push from shallow clone, with grafted roots' ' test_expect_success 'push from shallow clone, with grafted roots' '
( (
cd shallow2 && cd shallow2 &&
test_must_fail git push ../.git +master:refs/remotes/shallow2/master 2>err && test_must_fail git push ../.git +main:refs/remotes/shallow2/main 2>err &&
grep "shallow2/master.*shallow update not allowed" err grep "shallow2/main.*shallow update not allowed" err
) && ) &&
test_must_fail git rev-parse shallow2/master && test_must_fail git rev-parse shallow2/main &&
git fsck git fsck
' '
@ -75,9 +75,9 @@ test_expect_success 'add new shallow root with receive.updateshallow on' '
test_config receive.shallowupdate true && test_config receive.shallowupdate true &&
( (
cd shallow2 && cd shallow2 &&
git push ../.git +master:refs/remotes/shallow2/master git push ../.git +main:refs/remotes/shallow2/main
) && ) &&
git log --format=%s shallow2/master >actual && git log --format=%s shallow2/main >actual &&
git fsck && git fsck &&
cat <<EOF >expect && cat <<EOF >expect &&
c c
@ -90,12 +90,12 @@ test_expect_success 'push from shallow to shallow' '
( (
cd shallow && cd shallow &&
git --git-dir=../shallow2/.git config receive.shallowupdate true && git --git-dir=../shallow2/.git config receive.shallowupdate true &&
git push ../shallow2/.git +master:refs/remotes/shallow/master && git push ../shallow2/.git +main:refs/remotes/shallow/main &&
git --git-dir=../shallow2/.git config receive.shallowupdate false git --git-dir=../shallow2/.git config receive.shallowupdate false
) && ) &&
( (
cd shallow2 && cd shallow2 &&
git log --format=%s shallow/master >actual && git log --format=%s shallow/main >actual &&
git fsck && git fsck &&
cat <<EOF >expect && cat <<EOF >expect &&
5 5
@ -109,10 +109,10 @@ EOF
test_expect_success 'push from full to shallow' ' test_expect_success 'push from full to shallow' '
! git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) && ! git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) &&
commit 1 && commit 1 &&
git push shallow2/.git +master:refs/remotes/top/master && git push shallow2/.git +main:refs/remotes/top/main &&
( (
cd shallow2 && cd shallow2 &&
git log --format=%s top/master >actual && git log --format=%s top/main >actual &&
git fsck && git fsck &&
cat <<EOF >expect && cat <<EOF >expect &&
1 1

16
t/t5539-fetch-http-shallow.sh
Просмотреть файл

@ -2,7 +2,7 @@
test_description='fetch/clone from a shallow clone over http' test_description='fetch/clone from a shallow clone over http'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh . ./test-lib.sh
@ -35,7 +35,7 @@ test_expect_success 'clone http repository' '
( (
cd clone && cd clone &&
git fsck && git fsck &&
git log --format=%s origin/master >actual && git log --format=%s origin/main >actual &&
cat <<EOF >expect && cat <<EOF >expect &&
7 7
6 6
@ -63,9 +63,9 @@ test_expect_success 'no shallow lines after receiving ACK ready' '
refs/heads/unrelated$i:refs/heads/unrelated$i || refs/heads/unrelated$i:refs/heads/unrelated$i ||
exit 1 exit 1
done && done &&
git checkout master && git checkout main &&
test_commit new && test_commit new &&
git push "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" master git push "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" main
) && ) &&
( (
cd clone && cd clone &&
@ -98,7 +98,7 @@ test_expect_success 'clone shallow since ...' '
test_expect_success 'fetch shallow since ...' ' test_expect_success 'fetch shallow since ...' '
git -C shallow11 fetch --shallow-since "200000000 +0700" origin && git -C shallow11 fetch --shallow-since "200000000 +0700" origin &&
git -C shallow11 log --pretty=tformat:%s origin/master >actual && git -C shallow11 log --pretty=tformat:%s origin/main >actual &&
cat >expected <<-\EOF && cat >expected <<-\EOF &&
three three
two two
@ -123,7 +123,7 @@ test_expect_success 'shallow clone exclude tag two' '
test_expect_success 'fetch exclude tag one' ' test_expect_success 'fetch exclude tag one' '
git -C shallow12 fetch --shallow-exclude one origin && git -C shallow12 fetch --shallow-exclude one origin &&
git -C shallow12 log --pretty=tformat:%s origin/master >actual && git -C shallow12 log --pretty=tformat:%s origin/main >actual &&
test_write_lines three two >expected && test_write_lines three two >expected &&
test_cmp expected actual test_cmp expected actual
' '
@ -139,12 +139,12 @@ test_expect_success 'fetching deepen' '
git clone --depth 1 $HTTPD_URL/smart/shallow-deepen.git deepen && git clone --depth 1 $HTTPD_URL/smart/shallow-deepen.git deepen &&
mv "$HTTPD_DOCUMENT_ROOT_PATH/shallow-deepen.git" .git && mv "$HTTPD_DOCUMENT_ROOT_PATH/shallow-deepen.git" .git &&
test_commit four && test_commit four &&
git -C deepen log --pretty=tformat:%s master >actual && git -C deepen log --pretty=tformat:%s main >actual &&
echo three >expected && echo three >expected &&
test_cmp expected actual && test_cmp expected actual &&
mv .git "$HTTPD_DOCUMENT_ROOT_PATH/shallow-deepen.git" && mv .git "$HTTPD_DOCUMENT_ROOT_PATH/shallow-deepen.git" &&
git -C deepen fetch --deepen=1 && git -C deepen fetch --deepen=1 &&
git -C deepen log --pretty=tformat:%s origin/master >actual && git -C deepen log --pretty=tformat:%s origin/main >actual &&
cat >expected <<-\EOF && cat >expected <<-\EOF &&
four four
three three