2010-04-24 14:11:51 +02:00
|
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
test_description='Test workflows involving pull request.'
|
|
|
|
|
|
2020-11-19 00:44:29 +01: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-19 00:44:19 +01:00
|
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
|
2010-04-24 14:11:51 +02:00
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
2019-11-26 01:02:46 +01:00
|
|
|
|
if ! test_have_prereq PERL
|
|
|
|
|
then
|
|
|
|
|
skip_all='skipping request-pull tests, perl not available'
|
|
|
|
|
test_done
|
|
|
|
|
fi
|
|
|
|
|
|
2010-04-24 14:11:51 +02:00
|
|
|
|
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 &&
|
2020-11-19 00:44:29 +01:00
|
|
|
|
git push --tags origin main
|
2010-04-24 14:11:51 +02:00
|
|
|
|
) &&
|
|
|
|
|
(
|
|
|
|
|
cd local &&
|
|
|
|
|
git remote add upstream "$trash_url/upstream.git" &&
|
|
|
|
|
git fetch upstream &&
|
2020-11-19 00:44:29 +01:00
|
|
|
|
git pull upstream main &&
|
2010-04-24 14:11:51 +02:00
|
|
|
|
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." &&
|
2020-11-19 00:44:29 +01:00
|
|
|
|
git checkout main
|
2010-04-24 14:11:51 +02:00
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
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
|
2011-12-16 18:00:11 +01:00
|
|
|
|
# Note that a request could ask for "tag $tagname"
|
2017-10-03 02:08:38 +02:00
|
|
|
|
/ in the Git repository at:$/!d
|
2010-04-24 14:11:51 +02:00
|
|
|
|
n
|
2010-04-24 14:29:52 +02:00
|
|
|
|
/^$/ n
|
2011-12-16 18:00:11 +01:00
|
|
|
|
s/ tag \([^ ]*\)$/ tag--\1/
|
2010-04-24 14:11:51 +02:00
|
|
|
|
s/^[ ]*\(.*\) \([^ ]*\)/please pull\
|
|
|
|
|
\1\
|
|
|
|
|
\2/p
|
|
|
|
|
q
|
|
|
|
|
EOT
|
|
|
|
|
|
|
|
|
|
cat <<-EOT >fuzz.sed
|
|
|
|
|
#!/bin/sed -nf
|
2013-06-15 23:35:02 +02:00
|
|
|
|
s/$downstream_url_for_sed/URL/g
|
2018-05-13 04:24:15 +02:00
|
|
|
|
s/$OID_REGEX/OBJECT_NAME/g
|
2010-04-24 14:11:51 +02:00
|
|
|
|
s/A U Thor/AUTHOR/g
|
2010-04-24 14:29:52 +02:00
|
|
|
|
s/[-0-9]\{10\} [:0-9]\{8\} [-+][0-9]\{4\}/DATE/g
|
2010-04-24 14:11:51 +02:00
|
|
|
|
s/ [^ ].*/ SUBJECT/g
|
2010-04-24 14:29:52 +02:00
|
|
|
|
s/ [^ ].* (DATE)/ SUBJECT (DATE)/g
|
2014-01-23 23:23:43 +01:00
|
|
|
|
s|tags/full|BRANCH|g
|
2010-04-24 14:11:51 +02:00
|
|
|
|
s/mnemonic.txt/FILENAME/g
|
2011-11-09 14:05:00 +01:00
|
|
|
|
s/^version [0-9]/VERSION/
|
2010-04-24 14:11:51 +02:00
|
|
|
|
/^ FILENAME | *[0-9]* [-+]*\$/ b diffstat
|
|
|
|
|
/^AUTHOR ([0-9]*):\$/ b shortlog
|
|
|
|
|
p
|
|
|
|
|
b
|
|
|
|
|
: diffstat
|
|
|
|
|
n
|
2012-02-01 13:55:07 +01:00
|
|
|
|
/ [0-9]* files* changed/ {
|
2010-05-08 06:29:50 +02:00
|
|
|
|
a\\
|
2010-04-24 14:11:51 +02:00
|
|
|
|
DIFFSTAT
|
|
|
|
|
b
|
|
|
|
|
}
|
|
|
|
|
b diffstat
|
|
|
|
|
: shortlog
|
|
|
|
|
/^ [a-zA-Z]/ n
|
|
|
|
|
/^[a-zA-Z]* ([0-9]*):\$/ n
|
|
|
|
|
/^\$/ N
|
2010-06-02 02:13:42 +02:00
|
|
|
|
/^\n[a-zA-Z]* ([0-9]*):\$/!{
|
2010-05-08 06:29:50 +02:00
|
|
|
|
a\\
|
2010-04-24 14:11:51 +02:00
|
|
|
|
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 &&
|
2020-11-19 00:44:29 +01:00
|
|
|
|
git merge --ff-only main &&
|
2010-04-24 14:11:51 +02:00
|
|
|
|
test_must_fail git request-pull initial "$downstream_url" \
|
|
|
|
|
2>../err
|
|
|
|
|
) &&
|
2014-01-23 23:23:43 +01:00
|
|
|
|
grep "No match for commit .*" err &&
|
2010-04-24 14:11:51 +02:00
|
|
|
|
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 &&
|
2020-11-19 00:44:29 +01:00
|
|
|
|
git merge --ff-only main &&
|
|
|
|
|
git push origin main:for-upstream &&
|
|
|
|
|
git request-pull initial origin main:for-upstream >../request
|
2010-04-24 14:11:51 +02:00
|
|
|
|
) &&
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2014-01-23 23:23:43 +01:00
|
|
|
|
test_expect_success 'request asks HEAD to be pulled' '
|
2010-04-24 14:11:51 +02:00
|
|
|
|
|
|
|
|
|
rm -fr downstream.git &&
|
|
|
|
|
git init --bare downstream.git &&
|
|
|
|
|
(
|
|
|
|
|
cd local &&
|
|
|
|
|
git checkout initial &&
|
2020-11-19 00:44:29 +01:00
|
|
|
|
git merge --ff-only main &&
|
|
|
|
|
git push --tags origin main simplify &&
|
|
|
|
|
git push origin main:for-upstream &&
|
2010-04-24 14:11:51 +02:00
|
|
|
|
git request-pull initial "$downstream_url" >../request
|
|
|
|
|
) &&
|
|
|
|
|
sed -nf read-request.sed <request >digest &&
|
|
|
|
|
{
|
|
|
|
|
read task &&
|
|
|
|
|
read repository &&
|
|
|
|
|
read branch
|
|
|
|
|
} <digest &&
|
2014-01-23 23:23:43 +01:00
|
|
|
|
test -z "$branch"
|
2010-04-24 14:11:51 +02:00
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
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:
|
|
|
|
|
|
2010-04-24 14:29:52 +02:00
|
|
|
|
SUBJECT (DATE)
|
2010-04-24 14:11:51 +02:00
|
|
|
|
|
2017-10-03 02:08:38 +02:00
|
|
|
|
are available in the Git repository at:
|
2011-09-16 20:37:08 +02:00
|
|
|
|
|
2010-04-24 14:11:51 +02:00
|
|
|
|
URL BRANCH
|
|
|
|
|
|
2011-09-16 20:37:08 +02:00
|
|
|
|
for you to fetch changes up to OBJECT_NAME:
|
|
|
|
|
|
|
|
|
|
SUBJECT (DATE)
|
|
|
|
|
|
2011-11-09 14:05:00 +01:00
|
|
|
|
----------------------------------------------------------------
|
|
|
|
|
VERSION
|
|
|
|
|
|
2011-09-16 20:37:08 +02:00
|
|
|
|
----------------------------------------------------------------
|
2010-04-24 14:11:51 +02:00
|
|
|
|
SHORTLOG
|
|
|
|
|
|
|
|
|
|
DIFFSTAT
|
|
|
|
|
EOT
|
|
|
|
|
(
|
|
|
|
|
cd local &&
|
|
|
|
|
git checkout initial &&
|
2020-11-19 00:44:29 +01:00
|
|
|
|
git merge --ff-only main &&
|
2014-01-23 23:23:43 +01:00
|
|
|
|
git push origin tags/full &&
|
|
|
|
|
git request-pull initial "$downstream_url" tags/full >../request
|
2010-04-24 14:11:51 +02:00
|
|
|
|
) &&
|
|
|
|
|
<request sed -nf fuzz.sed >request.fuzzy &&
|
2021-02-11 02:53:53 +01:00
|
|
|
|
test_cmp expect request.fuzzy &&
|
2010-04-24 14:11:51 +02:00
|
|
|
|
|
2014-02-25 22:44:46 +01:00
|
|
|
|
(
|
|
|
|
|
cd local &&
|
|
|
|
|
git request-pull initial "$downstream_url" tags/full:refs/tags/full
|
|
|
|
|
) >request &&
|
|
|
|
|
sed -nf fuzz.sed <request >request.fuzzy &&
|
2021-02-11 02:53:53 +01:00
|
|
|
|
test_cmp expect request.fuzzy &&
|
2014-05-16 19:18:25 +02:00
|
|
|
|
|
|
|
|
|
(
|
|
|
|
|
cd local &&
|
|
|
|
|
git request-pull initial "$downstream_url" full
|
|
|
|
|
) >request &&
|
2014-06-02 09:06:56 +02:00
|
|
|
|
grep " tags/full\$" request
|
2010-04-24 14:11:51 +02:00
|
|
|
|
'
|
|
|
|
|
|
2010-04-24 14:15:37 +02:00
|
|
|
|
test_expect_success 'request-pull ignores OPTIONS_KEEPDASHDASH poison' '
|
|
|
|
|
|
|
|
|
|
(
|
|
|
|
|
cd local &&
|
|
|
|
|
OPTIONS_KEEPDASHDASH=Yes &&
|
|
|
|
|
export OPTIONS_KEEPDASHDASH &&
|
|
|
|
|
git checkout initial &&
|
2020-11-19 00:44:29 +01:00
|
|
|
|
git merge --ff-only main &&
|
|
|
|
|
git push origin main:for-upstream &&
|
|
|
|
|
git request-pull -- initial "$downstream_url" main:for-upstream >../request
|
2010-04-24 14:15:37 +02:00
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2019-05-28 12:15:42 +02:00
|
|
|
|
test_expect_success 'request-pull quotes regex metacharacters properly' '
|
|
|
|
|
|
|
|
|
|
rm -fr downstream.git &&
|
|
|
|
|
git init --bare downstream.git &&
|
|
|
|
|
(
|
|
|
|
|
cd local &&
|
|
|
|
|
git checkout initial &&
|
2020-11-19 00:44:29 +01:00
|
|
|
|
git merge --ff-only main &&
|
2019-05-28 12:15:42 +02:00
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2019-05-28 12:15:43 +02:00
|
|
|
|
test_expect_success 'pull request with mismatched object' '
|
|
|
|
|
|
|
|
|
|
rm -fr downstream.git &&
|
|
|
|
|
git init --bare downstream.git &&
|
|
|
|
|
(
|
|
|
|
|
cd local &&
|
|
|
|
|
git checkout initial &&
|
2020-11-19 00:44:29 +01:00
|
|
|
|
git merge --ff-only main &&
|
2019-05-28 12:15:43 +02:00
|
|
|
|
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 &&
|
2020-11-19 00:44:29 +01:00
|
|
|
|
git merge --ff-only main &&
|
2019-05-28 12:15:43 +02:00
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2010-04-24 14:11:51 +02:00
|
|
|
|
test_done
|