334afbc76f
In addition to the manual adjustment to let the `linux-gcc` CI job run the test suite with `master` and then with `main`, this patch makes sure that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts that currently rely on the initial branch name being `master by default. To determine which test scripts to mark up, the first step was to force-set the default branch name to `master` in - all test scripts that contain the keyword `master`, - t4211, which expects `t/t4211/history.export` with a hard-coded ref to initialize the default branch, - t5560 because it sources `t/t556x_common` which uses `master`, - t8002 and t8012 because both source `t/annotate-tests.sh` which also uses `master`) This trick was performed by this command: $ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\ ' $(git grep -l master t/t[0-9]*.sh) \ t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh After that, careful, manual inspection revealed that some of the test scripts containing the needle `master` do not actually rely on a specific default branch name: either they mention `master` only in a comment, or they initialize that branch specificially, or they do not actually refer to the current default branch. Therefore, the aforementioned modification was undone in those test scripts thusly: $ git checkout HEAD -- \ t/t0027-auto-crlf.sh t/t0060-path-utils.sh \ t/t1011-read-tree-sparse-checkout.sh \ t/t1305-config-include.sh t/t1309-early-config.sh \ t/t1402-check-ref-format.sh t/t1450-fsck.sh \ t/t2024-checkout-dwim.sh \ t/t2106-update-index-assume-unchanged.sh \ t/t3040-subprojects-basic.sh t/t3301-notes.sh \ t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \ t/t3436-rebase-more-options.sh \ t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \ t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \ t/t5511-refspec.sh t/t5526-fetch-submodules.sh \ t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \ t/t5548-push-porcelain.sh \ t/t5552-skipping-fetch-negotiator.sh \ t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \ t/t5614-clone-submodules-shallow.sh \ t/t7508-status.sh t/t7606-merge-custom.sh \ t/t9302-fast-import-unpack-limit.sh We excluded one set of test scripts in these commands, though: the range of `git p4` tests. The reason? `git p4` stores the (foreign) remote branch in the branch called `p4/master`, which is obviously not the default branch. Manual analysis revealed that only five of these tests actually require a specific default branch name to pass; They were modified thusly: $ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\ ' t/t980[0167]*.sh t/t9811*.sh Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
325 lines
7.7 KiB
Bash
Executable File
325 lines
7.7 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2010 Sverre Rabbelier
|
|
#
|
|
|
|
test_description='Test remote-helper import and export commands'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-gpg.sh
|
|
|
|
PATH="$TEST_DIRECTORY/t5801:$PATH"
|
|
|
|
compare_refs() {
|
|
fail= &&
|
|
if test "x$1" = 'x!'
|
|
then
|
|
fail='!' &&
|
|
shift
|
|
fi &&
|
|
git --git-dir="$1/.git" rev-parse --verify $2 >expect &&
|
|
git --git-dir="$3/.git" rev-parse --verify $4 >actual &&
|
|
eval $fail test_cmp expect actual
|
|
}
|
|
|
|
test_expect_success 'setup repository' '
|
|
git init server &&
|
|
(cd server &&
|
|
echo content >file &&
|
|
git add file &&
|
|
git commit -m one)
|
|
'
|
|
|
|
test_expect_success 'cloning from local repo' '
|
|
git clone "testgit::${PWD}/server" local &&
|
|
test_cmp server/file local/file
|
|
'
|
|
|
|
test_expect_success 'create new commit on remote' '
|
|
(cd server &&
|
|
echo content >>file &&
|
|
git commit -a -m two)
|
|
'
|
|
|
|
test_expect_success 'pulling from local repo' '
|
|
(cd local && git pull) &&
|
|
test_cmp server/file local/file
|
|
'
|
|
|
|
test_expect_success 'pushing to local repo' '
|
|
(cd local &&
|
|
echo content >>file &&
|
|
git commit -a -m three &&
|
|
git push) &&
|
|
compare_refs local HEAD server HEAD
|
|
'
|
|
|
|
test_expect_success 'fetch new branch' '
|
|
(cd server &&
|
|
git reset --hard &&
|
|
git checkout -b new &&
|
|
echo content >>file &&
|
|
git commit -a -m five
|
|
) &&
|
|
(cd local &&
|
|
git fetch origin new
|
|
) &&
|
|
compare_refs server HEAD local FETCH_HEAD
|
|
'
|
|
|
|
test_expect_success 'fetch multiple branches' '
|
|
(cd local &&
|
|
git fetch
|
|
) &&
|
|
compare_refs server master local refs/remotes/origin/master &&
|
|
compare_refs server new local refs/remotes/origin/new
|
|
'
|
|
|
|
test_expect_success 'push when remote has extra refs' '
|
|
(cd local &&
|
|
git reset --hard origin/master &&
|
|
echo content >>file &&
|
|
git commit -a -m six &&
|
|
git push
|
|
) &&
|
|
compare_refs local master server master
|
|
'
|
|
|
|
test_expect_success 'push new branch by name' '
|
|
(cd local &&
|
|
git checkout -b new-name &&
|
|
echo content >>file &&
|
|
git commit -a -m seven &&
|
|
git push origin new-name
|
|
) &&
|
|
compare_refs local HEAD server refs/heads/new-name
|
|
'
|
|
|
|
test_expect_success 'push new branch with old:new refspec' '
|
|
(cd local &&
|
|
git push origin new-name:new-refspec
|
|
) &&
|
|
compare_refs local HEAD server refs/heads/new-refspec
|
|
'
|
|
|
|
test_expect_success 'push new branch with HEAD:new refspec' '
|
|
(cd local &&
|
|
git checkout new-name &&
|
|
git push origin HEAD:new-refspec-2
|
|
) &&
|
|
compare_refs local HEAD server refs/heads/new-refspec-2
|
|
'
|
|
|
|
test_expect_success 'push delete branch' '
|
|
(cd local &&
|
|
git push origin :new-name
|
|
) &&
|
|
test_must_fail git --git-dir="server/.git" \
|
|
rev-parse --verify refs/heads/new-name
|
|
'
|
|
|
|
test_expect_success 'forced push' '
|
|
(cd local &&
|
|
git checkout -b force-test &&
|
|
echo content >> file &&
|
|
git commit -a -m eight &&
|
|
git push origin force-test &&
|
|
echo content >> file &&
|
|
git commit -a --amend -m eight-modified &&
|
|
git push --force origin force-test
|
|
) &&
|
|
compare_refs local refs/heads/force-test server refs/heads/force-test
|
|
'
|
|
|
|
test_expect_success 'cloning without refspec' '
|
|
GIT_REMOTE_TESTGIT_NOREFSPEC=1 \
|
|
git clone "testgit::${PWD}/server" local2 2>error &&
|
|
test_i18ngrep "this remote helper should implement refspec capability" error &&
|
|
compare_refs local2 HEAD server HEAD
|
|
'
|
|
|
|
test_expect_success 'pulling without refspecs' '
|
|
(cd local2 &&
|
|
git reset --hard &&
|
|
GIT_REMOTE_TESTGIT_NOREFSPEC=1 git pull 2>../error) &&
|
|
test_i18ngrep "this remote helper should implement refspec capability" error &&
|
|
compare_refs local2 HEAD server HEAD
|
|
'
|
|
|
|
test_expect_success 'pushing without refspecs' '
|
|
test_when_finished "(cd local2 && git reset --hard origin)" &&
|
|
(cd local2 &&
|
|
echo content >>file &&
|
|
git commit -a -m ten &&
|
|
GIT_REMOTE_TESTGIT_NOREFSPEC=1 &&
|
|
export GIT_REMOTE_TESTGIT_NOREFSPEC &&
|
|
test_must_fail git push 2>../error) &&
|
|
test_i18ngrep "remote-helper doesn.t support push; refspec needed" error
|
|
'
|
|
|
|
test_expect_success 'pulling without marks' '
|
|
(cd local2 &&
|
|
GIT_REMOTE_TESTGIT_NO_MARKS=1 git pull) &&
|
|
compare_refs local2 HEAD server HEAD
|
|
'
|
|
|
|
test_expect_failure 'pushing without marks' '
|
|
test_when_finished "(cd local2 && git reset --hard origin)" &&
|
|
(cd local2 &&
|
|
echo content >>file &&
|
|
git commit -a -m twelve &&
|
|
GIT_REMOTE_TESTGIT_NO_MARKS=1 git push) &&
|
|
compare_refs local2 HEAD server HEAD
|
|
'
|
|
|
|
test_expect_success 'push all with existing object' '
|
|
(cd local &&
|
|
git branch dup2 master &&
|
|
git push origin --all
|
|
) &&
|
|
compare_refs local dup2 server dup2
|
|
'
|
|
|
|
test_expect_success 'push ref with existing object' '
|
|
(cd local &&
|
|
git branch dup master &&
|
|
git push origin dup
|
|
) &&
|
|
compare_refs local dup server dup
|
|
'
|
|
|
|
test_expect_success GPG 'push signed tag' '
|
|
(cd local &&
|
|
git checkout master &&
|
|
git tag -s -m signed-tag signed-tag &&
|
|
git push origin signed-tag
|
|
) &&
|
|
compare_refs local signed-tag^{} server signed-tag^{} &&
|
|
compare_refs ! local signed-tag server signed-tag
|
|
'
|
|
|
|
test_expect_success GPG 'push signed tag with signed-tags capability' '
|
|
(cd local &&
|
|
git checkout master &&
|
|
git tag -s -m signed-tag signed-tag-2 &&
|
|
GIT_REMOTE_TESTGIT_SIGNED_TAGS=1 git push origin signed-tag-2
|
|
) &&
|
|
compare_refs local signed-tag-2 server signed-tag-2
|
|
'
|
|
|
|
test_expect_success 'push update refs' '
|
|
(cd local &&
|
|
git checkout -b update master &&
|
|
echo update >>file &&
|
|
git commit -a -m update &&
|
|
git push origin update &&
|
|
git rev-parse --verify remotes/origin/update >expect &&
|
|
git rev-parse --verify testgit/origin/heads/update >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'push update refs disabled by no-private-update' '
|
|
(cd local &&
|
|
echo more-update >>file &&
|
|
git commit -a -m more-update &&
|
|
git rev-parse --verify testgit/origin/heads/update >expect &&
|
|
GIT_REMOTE_TESTGIT_NO_PRIVATE_UPDATE=t git push origin update &&
|
|
git rev-parse --verify testgit/origin/heads/update >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'push update refs failure' '
|
|
(cd local &&
|
|
git checkout update &&
|
|
echo "update fail" >>file &&
|
|
git commit -a -m "update fail" &&
|
|
git rev-parse --verify testgit/origin/heads/update >expect &&
|
|
test_expect_code 1 env GIT_REMOTE_TESTGIT_FAILURE="non-fast forward" \
|
|
git push origin update &&
|
|
git rev-parse --verify testgit/origin/heads/update >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
clean_mark () {
|
|
cut -f 2 -d ' ' "$1" |
|
|
git cat-file --batch-check |
|
|
grep commit |
|
|
sort >$(basename "$1")
|
|
}
|
|
|
|
test_expect_success 'proper failure checks for fetching' '
|
|
(cd local &&
|
|
test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git fetch 2>error &&
|
|
test_i18ngrep -q "error while running fast-import" error
|
|
)
|
|
'
|
|
|
|
test_expect_success 'proper failure checks for pushing' '
|
|
test_when_finished "rm -rf local/git.marks local/testgit.marks" &&
|
|
(cd local &&
|
|
git checkout -b crash master &&
|
|
echo crash >>file &&
|
|
git commit -a -m crash &&
|
|
test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git push --all &&
|
|
clean_mark ".git/testgit/origin/git.marks" &&
|
|
clean_mark ".git/testgit/origin/testgit.marks" &&
|
|
test_cmp git.marks testgit.marks
|
|
)
|
|
'
|
|
|
|
test_expect_success 'push messages' '
|
|
(cd local &&
|
|
git checkout -b new_branch master &&
|
|
echo new >>file &&
|
|
git commit -a -m new &&
|
|
git push origin new_branch &&
|
|
git fetch origin &&
|
|
echo new >>file &&
|
|
git commit -a -m new &&
|
|
git push origin new_branch 2> msg &&
|
|
! grep "\[new branch\]" msg
|
|
)
|
|
'
|
|
|
|
test_expect_success 'fetch HEAD' '
|
|
(cd server &&
|
|
git checkout master &&
|
|
echo more >>file &&
|
|
git commit -a -m more
|
|
) &&
|
|
(cd local &&
|
|
git fetch origin HEAD
|
|
) &&
|
|
compare_refs server HEAD local FETCH_HEAD
|
|
'
|
|
|
|
test_expect_success 'fetch url' '
|
|
(cd server &&
|
|
git checkout master &&
|
|
echo more >>file &&
|
|
git commit -a -m more
|
|
) &&
|
|
(cd local &&
|
|
git fetch "testgit::${PWD}/../server"
|
|
) &&
|
|
compare_refs server HEAD local FETCH_HEAD
|
|
'
|
|
|
|
test_expect_success 'fetch tag' '
|
|
(cd server &&
|
|
git tag v1.0
|
|
) &&
|
|
(cd local &&
|
|
git fetch
|
|
) &&
|
|
compare_refs local v1.0 server v1.0
|
|
'
|
|
|
|
test_done
|