mirror of
https://github.com/git/git
synced 2024-10-28 19:25:47 +00:00
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>
309 lines
6.8 KiB
Bash
Executable file
309 lines
6.8 KiB
Bash
Executable file
#!/bin/sh
|
||
|
||
test_description='Test workflows involving pull request.'
|
||
|
||
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
|
||
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
||
|
||
. ./test-lib.sh
|
||
|
||
if ! test_have_prereq PERL
|
||
then
|
||
skip_all='skipping request-pull tests, perl not available'
|
||
test_done
|
||
fi
|
||
|
||
test_expect_success 'setup' '
|
||
|
||
git init --bare upstream.git &&
|
||
git init --bare downstream.git &&
|
||
git clone upstream.git upstream-private &&
|
||
git clone downstream.git local &&
|
||
|
||
trash_url="file://$TRASH_DIRECTORY" &&
|
||
downstream_url="$trash_url/downstream.git/" &&
|
||
upstream_url="$trash_url/upstream.git/" &&
|
||
|
||
(
|
||
cd upstream-private &&
|
||
cat <<-\EOT >mnemonic.txt &&
|
||
Thirtey days hath November,
|
||
Aprile, June, and September:
|
||
EOT
|
||
git add mnemonic.txt &&
|
||
test_tick &&
|
||
git commit -m "\"Thirty days\", a reminder of month lengths" &&
|
||
git tag -m "version 1" -a initial &&
|
||
git push --tags origin master
|
||
) &&
|
||
(
|
||
cd local &&
|
||
git remote add upstream "$trash_url/upstream.git" &&
|
||
git fetch upstream &&
|
||
git pull upstream master &&
|
||
cat <<-\EOT >>mnemonic.txt &&
|
||
Of twyecescore-eightt is but eine,
|
||
And all the remnante be thrycescore-eine.
|
||
O’course Leap yare comes an’pynes,
|
||
Ev’rie foure yares, gote it ryghth.
|
||
An’twyecescore-eight is but twyecescore-nyne.
|
||
EOT
|
||
git add mnemonic.txt &&
|
||
test_tick &&
|
||
git commit -m "More detail" &&
|
||
git tag -m "version 2" -a full &&
|
||
git checkout -b simplify HEAD^ &&
|
||
mv mnemonic.txt mnemonic.standard &&
|
||
cat <<-\EOT >mnemonic.clarified &&
|
||
Thirty days has September,
|
||
All the rest I can’t remember.
|
||
EOT
|
||
git add -N mnemonic.standard mnemonic.clarified &&
|
||
git commit -a -m "Adapt to use modern, simpler English
|
||
|
||
But keep the old version, too, in case some people prefer it." &&
|
||
git checkout master
|
||
)
|
||
|
||
'
|
||
|
||
test_expect_success 'setup: two scripts for reading pull requests' '
|
||
|
||
downstream_url_for_sed=$(
|
||
printf "%s\n" "$downstream_url" |
|
||
sed -e '\''s/\\/\\\\/g'\'' -e '\''s/[[/.*^$]/\\&/g'\''
|
||
) &&
|
||
|
||
cat <<-\EOT >read-request.sed &&
|
||
#!/bin/sed -nf
|
||
# Note that a request could ask for "tag $tagname"
|
||
/ in the Git repository at:$/!d
|
||
n
|
||
/^$/ n
|
||
s/ tag \([^ ]*\)$/ tag--\1/
|
||
s/^[ ]*\(.*\) \([^ ]*\)/please pull\
|
||
\1\
|
||
\2/p
|
||
q
|
||
EOT
|
||
|
||
cat <<-EOT >fuzz.sed
|
||
#!/bin/sed -nf
|
||
s/$downstream_url_for_sed/URL/g
|
||
s/$OID_REGEX/OBJECT_NAME/g
|
||
s/A U Thor/AUTHOR/g
|
||
s/[-0-9]\{10\} [:0-9]\{8\} [-+][0-9]\{4\}/DATE/g
|
||
s/ [^ ].*/ SUBJECT/g
|
||
s/ [^ ].* (DATE)/ SUBJECT (DATE)/g
|
||
s|tags/full|BRANCH|g
|
||
s/mnemonic.txt/FILENAME/g
|
||
s/^version [0-9]/VERSION/
|
||
/^ FILENAME | *[0-9]* [-+]*\$/ b diffstat
|
||
/^AUTHOR ([0-9]*):\$/ b shortlog
|
||
p
|
||
b
|
||
: diffstat
|
||
n
|
||
/ [0-9]* files* changed/ {
|
||
a\\
|
||
DIFFSTAT
|
||
b
|
||
}
|
||
b diffstat
|
||
: shortlog
|
||
/^ [a-zA-Z]/ n
|
||
/^[a-zA-Z]* ([0-9]*):\$/ n
|
||
/^\$/ N
|
||
/^\n[a-zA-Z]* ([0-9]*):\$/!{
|
||
a\\
|
||
SHORTLOG
|
||
D
|
||
}
|
||
n
|
||
b shortlog
|
||
EOT
|
||
|
||
'
|
||
|
||
test_expect_success 'pull request when forgot to push' '
|
||
|
||
rm -fr downstream.git &&
|
||
git init --bare downstream.git &&
|
||
(
|
||
cd local &&
|
||
git checkout initial &&
|
||
git merge --ff-only master &&
|
||
test_must_fail git request-pull initial "$downstream_url" \
|
||
2>../err
|
||
) &&
|
||
grep "No match for commit .*" err &&
|
||
grep "Are you sure you pushed" err
|
||
|
||
'
|
||
|
||
test_expect_success 'pull request after push' '
|
||
|
||
rm -fr downstream.git &&
|
||
git init --bare downstream.git &&
|
||
(
|
||
cd local &&
|
||
git checkout initial &&
|
||
git merge --ff-only master &&
|
||
git push origin master:for-upstream &&
|
||
git request-pull initial origin master:for-upstream >../request
|
||
) &&
|
||
sed -nf read-request.sed <request >digest &&
|
||
{
|
||
read task &&
|
||
read repository &&
|
||
read branch
|
||
} <digest &&
|
||
(
|
||
cd upstream-private &&
|
||
git checkout initial &&
|
||
git pull --ff-only "$repository" "$branch"
|
||
) &&
|
||
test "$branch" = for-upstream &&
|
||
test_cmp local/mnemonic.txt upstream-private/mnemonic.txt
|
||
|
||
'
|
||
|
||
test_expect_success 'request asks HEAD to be pulled' '
|
||
|
||
rm -fr downstream.git &&
|
||
git init --bare downstream.git &&
|
||
(
|
||
cd local &&
|
||
git checkout initial &&
|
||
git merge --ff-only master &&
|
||
git push --tags origin master simplify &&
|
||
git push origin master:for-upstream &&
|
||
git request-pull initial "$downstream_url" >../request
|
||
) &&
|
||
sed -nf read-request.sed <request >digest &&
|
||
{
|
||
read task &&
|
||
read repository &&
|
||
read branch
|
||
} <digest &&
|
||
test -z "$branch"
|
||
|
||
'
|
||
|
||
test_expect_success 'pull request format' '
|
||
|
||
rm -fr downstream.git &&
|
||
git init --bare downstream.git &&
|
||
cat <<-\EOT >expect &&
|
||
The following changes since commit OBJECT_NAME:
|
||
|
||
SUBJECT (DATE)
|
||
|
||
are available in the Git repository at:
|
||
|
||
URL BRANCH
|
||
|
||
for you to fetch changes up to OBJECT_NAME:
|
||
|
||
SUBJECT (DATE)
|
||
|
||
----------------------------------------------------------------
|
||
VERSION
|
||
|
||
----------------------------------------------------------------
|
||
SHORTLOG
|
||
|
||
DIFFSTAT
|
||
EOT
|
||
(
|
||
cd local &&
|
||
git checkout initial &&
|
||
git merge --ff-only master &&
|
||
git push origin tags/full &&
|
||
git request-pull initial "$downstream_url" tags/full >../request
|
||
) &&
|
||
<request sed -nf fuzz.sed >request.fuzzy &&
|
||
test_i18ncmp expect request.fuzzy &&
|
||
|
||
(
|
||
cd local &&
|
||
git request-pull initial "$downstream_url" tags/full:refs/tags/full
|
||
) >request &&
|
||
sed -nf fuzz.sed <request >request.fuzzy &&
|
||
test_i18ncmp expect request.fuzzy &&
|
||
|
||
(
|
||
cd local &&
|
||
git request-pull initial "$downstream_url" full
|
||
) >request &&
|
||
grep " tags/full\$" request
|
||
'
|
||
|
||
test_expect_success 'request-pull ignores OPTIONS_KEEPDASHDASH poison' '
|
||
|
||
(
|
||
cd local &&
|
||
OPTIONS_KEEPDASHDASH=Yes &&
|
||
export OPTIONS_KEEPDASHDASH &&
|
||
git checkout initial &&
|
||
git merge --ff-only master &&
|
||
git push origin master:for-upstream &&
|
||
git request-pull -- initial "$downstream_url" master:for-upstream >../request
|
||
)
|
||
|
||
'
|
||
|
||
test_expect_success 'request-pull quotes regex metacharacters properly' '
|
||
|
||
rm -fr downstream.git &&
|
||
git init --bare downstream.git &&
|
||
(
|
||
cd local &&
|
||
git checkout initial &&
|
||
git merge --ff-only master &&
|
||
git tag -mrelease v2.0 &&
|
||
git push origin refs/tags/v2.0:refs/tags/v2-0 &&
|
||
test_must_fail git request-pull initial "$downstream_url" tags/v2.0 \
|
||
2>../err
|
||
) &&
|
||
grep "No match for commit .*" err &&
|
||
grep "Are you sure you pushed" err
|
||
|
||
'
|
||
|
||
test_expect_success 'pull request with mismatched object' '
|
||
|
||
rm -fr downstream.git &&
|
||
git init --bare downstream.git &&
|
||
(
|
||
cd local &&
|
||
git checkout initial &&
|
||
git merge --ff-only master &&
|
||
git push origin HEAD:refs/tags/full &&
|
||
test_must_fail git request-pull initial "$downstream_url" tags/full \
|
||
2>../err
|
||
) &&
|
||
grep "points to a different object" err &&
|
||
grep "Are you sure you pushed" err
|
||
|
||
'
|
||
|
||
test_expect_success 'pull request with stale object' '
|
||
|
||
rm -fr downstream.git &&
|
||
git init --bare downstream.git &&
|
||
(
|
||
cd local &&
|
||
git checkout initial &&
|
||
git merge --ff-only master &&
|
||
git push origin refs/tags/full &&
|
||
git tag -f -m"Thirty-one days" full &&
|
||
test_must_fail git request-pull initial "$downstream_url" tags/full \
|
||
2>../err
|
||
) &&
|
||
grep "points to a different object" err &&
|
||
grep "Are you sure you pushed" err
|
||
|
||
'
|
||
|
||
test_done
|