2007-11-09 23:32:41 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='pushing to a mirror repository'
|
|
|
|
|
2020-11-18 23:44:32 +00:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-18 23:44:19 +00:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
2007-11-09 23:32:41 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
2015-12-23 13:45:58 +00:00
|
|
|
D=$(pwd)
|
2007-11-09 23:32:41 +00:00
|
|
|
|
|
|
|
invert () {
|
|
|
|
if "$@"; then
|
|
|
|
return 1
|
|
|
|
else
|
|
|
|
return 0
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
mk_repo_pair () {
|
2020-11-18 23:44:32 +00:00
|
|
|
rm -rf main mirror &&
|
2007-11-09 23:32:41 +00:00
|
|
|
mkdir mirror &&
|
|
|
|
(
|
|
|
|
cd mirror &&
|
2009-02-11 10:28:03 +00:00
|
|
|
git init &&
|
|
|
|
git config receive.denyCurrentBranch warn
|
2007-11-09 23:32:41 +00:00
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
mkdir main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
(
|
2020-11-18 23:44:32 +00:00
|
|
|
cd main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
git init &&
|
2008-04-17 11:17:20 +00:00
|
|
|
git remote add $1 up ../mirror
|
2007-11-09 23:32:41 +00:00
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
# BRANCH tests
|
|
|
|
test_expect_success 'push mirror creates new branches' '
|
|
|
|
|
|
|
|
mk_repo_pair &&
|
|
|
|
(
|
2020-11-18 23:44:32 +00:00
|
|
|
cd main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
echo one >foo && git add foo && git commit -m one &&
|
|
|
|
git push --mirror up
|
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
|
|
|
|
mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
|
|
|
|
test "$main_main" = "$mirror_main"
|
2007-11-09 23:32:41 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push mirror updates existing branches' '
|
|
|
|
|
|
|
|
mk_repo_pair &&
|
|
|
|
(
|
2020-11-18 23:44:32 +00:00
|
|
|
cd main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
echo one >foo && git add foo && git commit -m one &&
|
|
|
|
git push --mirror up &&
|
|
|
|
echo two >foo && git add foo && git commit -m two &&
|
|
|
|
git push --mirror up
|
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
|
|
|
|
mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
|
|
|
|
test "$main_main" = "$mirror_main"
|
2007-11-09 23:32:41 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push mirror force updates existing branches' '
|
|
|
|
|
|
|
|
mk_repo_pair &&
|
|
|
|
(
|
2020-11-18 23:44:32 +00:00
|
|
|
cd main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
echo one >foo && git add foo && git commit -m one &&
|
|
|
|
git push --mirror up &&
|
|
|
|
echo two >foo && git add foo && git commit -m two &&
|
|
|
|
git push --mirror up &&
|
2018-07-02 00:24:01 +00:00
|
|
|
git reset --hard HEAD^ &&
|
2007-11-09 23:32:41 +00:00
|
|
|
git push --mirror up
|
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
|
|
|
|
mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
|
|
|
|
test "$main_main" = "$mirror_main"
|
2007-11-09 23:32:41 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push mirror removes branches' '
|
|
|
|
|
|
|
|
mk_repo_pair &&
|
|
|
|
(
|
2020-11-18 23:44:32 +00:00
|
|
|
cd main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
echo one >foo && git add foo && git commit -m one &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git branch remove main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
git push --mirror up &&
|
2018-07-02 00:24:01 +00:00
|
|
|
git branch -D remove &&
|
2007-11-09 23:32:41 +00:00
|
|
|
git push --mirror up
|
|
|
|
) &&
|
|
|
|
(
|
|
|
|
cd mirror &&
|
|
|
|
invert git show-ref -s --verify refs/heads/remove
|
|
|
|
)
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push mirror adds, updates and removes branches together' '
|
|
|
|
|
|
|
|
mk_repo_pair &&
|
|
|
|
(
|
2020-11-18 23:44:32 +00:00
|
|
|
cd main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
echo one >foo && git add foo && git commit -m one &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git branch remove main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
git push --mirror up &&
|
|
|
|
git branch -D remove &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git branch add main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
echo two >foo && git add foo && git commit -m two &&
|
|
|
|
git push --mirror up
|
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
|
|
|
|
main_add=$(cd main && git show-ref -s --verify refs/heads/add) &&
|
|
|
|
mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
|
2007-11-09 23:32:41 +00:00
|
|
|
mirror_add=$(cd mirror && git show-ref -s --verify refs/heads/add) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test "$main_main" = "$mirror_main" &&
|
|
|
|
test "$main_add" = "$mirror_add" &&
|
2007-11-09 23:32:41 +00:00
|
|
|
(
|
|
|
|
cd mirror &&
|
|
|
|
invert git show-ref -s --verify refs/heads/remove
|
|
|
|
)
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
|
|
# TAG tests
|
|
|
|
test_expect_success 'push mirror creates new tags' '
|
|
|
|
|
|
|
|
mk_repo_pair &&
|
|
|
|
(
|
2020-11-18 23:44:32 +00:00
|
|
|
cd main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
echo one >foo && git add foo && git commit -m one &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git tag -f tmain main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
git push --mirror up
|
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
|
|
|
|
mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
|
|
|
|
test "$main_main" = "$mirror_main"
|
2007-11-09 23:32:41 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push mirror updates existing tags' '
|
|
|
|
|
|
|
|
mk_repo_pair &&
|
|
|
|
(
|
2020-11-18 23:44:32 +00:00
|
|
|
cd main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
echo one >foo && git add foo && git commit -m one &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git tag -f tmain main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
git push --mirror up &&
|
|
|
|
echo two >foo && git add foo && git commit -m two &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git tag -f tmain main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
git push --mirror up
|
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
|
|
|
|
mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
|
|
|
|
test "$main_main" = "$mirror_main"
|
2007-11-09 23:32:41 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push mirror force updates existing tags' '
|
|
|
|
|
|
|
|
mk_repo_pair &&
|
|
|
|
(
|
2020-11-18 23:44:32 +00:00
|
|
|
cd main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
echo one >foo && git add foo && git commit -m one &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git tag -f tmain main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
git push --mirror up &&
|
|
|
|
echo two >foo && git add foo && git commit -m two &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git tag -f tmain main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
git push --mirror up &&
|
2018-07-02 00:24:01 +00:00
|
|
|
git reset --hard HEAD^ &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git tag -f tmain main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
git push --mirror up
|
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
|
|
|
|
mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
|
|
|
|
test "$main_main" = "$mirror_main"
|
2007-11-09 23:32:41 +00:00
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push mirror removes tags' '
|
|
|
|
|
|
|
|
mk_repo_pair &&
|
|
|
|
(
|
2020-11-18 23:44:32 +00:00
|
|
|
cd main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
echo one >foo && git add foo && git commit -m one &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git tag -f tremove main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
git push --mirror up &&
|
2018-07-02 00:24:01 +00:00
|
|
|
git tag -d tremove &&
|
2007-11-09 23:32:41 +00:00
|
|
|
git push --mirror up
|
|
|
|
) &&
|
|
|
|
(
|
|
|
|
cd mirror &&
|
|
|
|
invert git show-ref -s --verify refs/tags/tremove
|
|
|
|
)
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push mirror adds, updates and removes tags together' '
|
|
|
|
|
|
|
|
mk_repo_pair &&
|
|
|
|
(
|
2020-11-18 23:44:32 +00:00
|
|
|
cd main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
echo one >foo && git add foo && git commit -m one &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git tag -f tmain main &&
|
|
|
|
git tag -f tremove main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
git push --mirror up &&
|
|
|
|
git tag -d tremove &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git tag tadd main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
echo two >foo && git add foo && git commit -m two &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git tag -f tmain main &&
|
2007-11-09 23:32:41 +00:00
|
|
|
git push --mirror up
|
|
|
|
) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
|
|
|
|
main_add=$(cd main && git show-ref -s --verify refs/tags/tadd) &&
|
|
|
|
mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
|
2007-11-09 23:32:41 +00:00
|
|
|
mirror_add=$(cd mirror && git show-ref -s --verify refs/tags/tadd) &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test "$main_main" = "$mirror_main" &&
|
|
|
|
test "$main_add" = "$mirror_add" &&
|
2007-11-09 23:32:41 +00:00
|
|
|
(
|
|
|
|
cd mirror &&
|
|
|
|
invert git show-ref -s --verify refs/tags/tremove
|
|
|
|
)
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2008-04-17 11:17:20 +00:00
|
|
|
test_expect_success 'remote.foo.mirror adds and removes branches' '
|
|
|
|
|
|
|
|
mk_repo_pair --mirror &&
|
|
|
|
(
|
2020-11-18 23:44:32 +00:00
|
|
|
cd main &&
|
2008-04-17 11:17:20 +00:00
|
|
|
echo one >foo && git add foo && git commit -m one &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git branch keep main &&
|
|
|
|
git branch remove main &&
|
2008-04-17 11:17:20 +00:00
|
|
|
git push up &&
|
2018-07-02 00:24:01 +00:00
|
|
|
git branch -D remove &&
|
2008-04-17 11:17:20 +00:00
|
|
|
git push up
|
|
|
|
) &&
|
|
|
|
(
|
|
|
|
cd mirror &&
|
|
|
|
git show-ref -s --verify refs/heads/keep &&
|
|
|
|
invert git show-ref -s --verify refs/heads/remove
|
|
|
|
)
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'remote.foo.mirror=no has no effect' '
|
|
|
|
|
|
|
|
mk_repo_pair &&
|
|
|
|
(
|
2020-11-18 23:44:32 +00:00
|
|
|
cd main &&
|
2008-04-17 11:17:20 +00:00
|
|
|
echo one >foo && git add foo && git commit -m one &&
|
|
|
|
git config --add remote.up.mirror no &&
|
2020-11-18 23:44:32 +00:00
|
|
|
git branch keep main &&
|
2008-04-17 11:17:20 +00:00
|
|
|
git push --mirror up &&
|
|
|
|
git branch -D keep &&
|
2013-01-05 00:09:15 +00:00
|
|
|
git push up :
|
2008-04-17 11:17:20 +00:00
|
|
|
) &&
|
|
|
|
(
|
|
|
|
cd mirror &&
|
|
|
|
git show-ref -s --verify refs/heads/keep
|
|
|
|
)
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2019-09-02 18:08:28 +00:00
|
|
|
test_expect_success 'push to mirrored repository with refspec fails' '
|
|
|
|
mk_repo_pair &&
|
|
|
|
(
|
2020-11-18 23:44:32 +00:00
|
|
|
cd main &&
|
2019-09-02 18:08:28 +00:00
|
|
|
echo one >foo && git add foo && git commit -m one &&
|
|
|
|
git config --add remote.up.mirror true &&
|
2020-11-18 23:44:32 +00:00
|
|
|
test_must_fail git push up main
|
2019-09-02 18:08:28 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2007-11-09 23:32:41 +00:00
|
|
|
test_done
|