2010-04-24 12:11:51 +00:00
|
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
test_description='Test workflows involving pull request.'
|
|
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
|
|
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
|
2011-12-16 17:00:11 +00:00
|
|
|
|
# Note that a request could ask for "tag $tagname"
|
2017-10-03 00:08:38 +00:00
|
|
|
|
/ in the Git repository at:$/!d
|
2010-04-24 12:11:51 +00:00
|
|
|
|
n
|
2010-04-24 12:29:52 +00:00
|
|
|
|
/^$/ n
|
2011-12-16 17:00:11 +00:00
|
|
|
|
s/ tag \([^ ]*\)$/ tag--\1/
|
2010-04-24 12:11:51 +00:00
|
|
|
|
s/^[ ]*\(.*\) \([^ ]*\)/please pull\
|
|
|
|
|
\1\
|
|
|
|
|
\2/p
|
|
|
|
|
q
|
|
|
|
|
EOT
|
|
|
|
|
|
|
|
|
|
cat <<-EOT >fuzz.sed
|
|
|
|
|
#!/bin/sed -nf
|
2013-06-15 21:35:02 +00:00
|
|
|
|
s/$downstream_url_for_sed/URL/g
|
2018-05-13 02:24:15 +00:00
|
|
|
|
s/$OID_REGEX/OBJECT_NAME/g
|
2010-04-24 12:11:51 +00:00
|
|
|
|
s/A U Thor/AUTHOR/g
|
2010-04-24 12:29:52 +00:00
|
|
|
|
s/[-0-9]\{10\} [:0-9]\{8\} [-+][0-9]\{4\}/DATE/g
|
2010-04-24 12:11:51 +00:00
|
|
|
|
s/ [^ ].*/ SUBJECT/g
|
2010-04-24 12:29:52 +00:00
|
|
|
|
s/ [^ ].* (DATE)/ SUBJECT (DATE)/g
|
2014-01-23 22:23:43 +00:00
|
|
|
|
s|tags/full|BRANCH|g
|
2010-04-24 12:11:51 +00:00
|
|
|
|
s/mnemonic.txt/FILENAME/g
|
2011-11-09 13:05:00 +00:00
|
|
|
|
s/^version [0-9]/VERSION/
|
2010-04-24 12:11:51 +00:00
|
|
|
|
/^ FILENAME | *[0-9]* [-+]*\$/ b diffstat
|
|
|
|
|
/^AUTHOR ([0-9]*):\$/ b shortlog
|
|
|
|
|
p
|
|
|
|
|
b
|
|
|
|
|
: diffstat
|
|
|
|
|
n
|
2012-02-01 12:55:07 +00:00
|
|
|
|
/ [0-9]* files* changed/ {
|
2010-05-08 04:29:50 +00:00
|
|
|
|
a\\
|
2010-04-24 12:11:51 +00:00
|
|
|
|
DIFFSTAT
|
|
|
|
|
b
|
|
|
|
|
}
|
|
|
|
|
b diffstat
|
|
|
|
|
: shortlog
|
|
|
|
|
/^ [a-zA-Z]/ n
|
|
|
|
|
/^[a-zA-Z]* ([0-9]*):\$/ n
|
|
|
|
|
/^\$/ N
|
2010-06-02 00:13:42 +00:00
|
|
|
|
/^\n[a-zA-Z]* ([0-9]*):\$/!{
|
2010-05-08 04:29:50 +00:00
|
|
|
|
a\\
|
2010-04-24 12:11:51 +00: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 &&
|
|
|
|
|
git merge --ff-only master &&
|
|
|
|
|
test_must_fail git request-pull initial "$downstream_url" \
|
|
|
|
|
2>../err
|
|
|
|
|
) &&
|
2014-01-23 22:23:43 +00:00
|
|
|
|
grep "No match for commit .*" err &&
|
2010-04-24 12:11:51 +00: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 &&
|
|
|
|
|
git merge --ff-only master &&
|
|
|
|
|
git push origin master:for-upstream &&
|
2014-01-23 22:23:43 +00:00
|
|
|
|
git request-pull initial origin master:for-upstream >../request
|
2010-04-24 12:11:51 +00:00
|
|
|
|
) &&
|
|
|
|
|
sed -nf read-request.sed <request >digest &&
|
|
|
|
|
cat 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 22:23:43 +00:00
|
|
|
|
test_expect_success 'request asks HEAD to be pulled' '
|
2010-04-24 12:11:51 +00:00
|
|
|
|
|
|
|
|
|
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 &&
|
|
|
|
|
cat digest &&
|
|
|
|
|
{
|
|
|
|
|
read task &&
|
|
|
|
|
read repository &&
|
|
|
|
|
read branch
|
|
|
|
|
} <digest &&
|
2014-01-23 22:23:43 +00:00
|
|
|
|
test -z "$branch"
|
2010-04-24 12:11:51 +00: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 12:29:52 +00:00
|
|
|
|
SUBJECT (DATE)
|
2010-04-24 12:11:51 +00:00
|
|
|
|
|
2017-10-03 00:08:38 +00:00
|
|
|
|
are available in the Git repository at:
|
2011-09-16 18:37:08 +00:00
|
|
|
|
|
2010-04-24 12:11:51 +00:00
|
|
|
|
URL BRANCH
|
|
|
|
|
|
2011-09-16 18:37:08 +00:00
|
|
|
|
for you to fetch changes up to OBJECT_NAME:
|
|
|
|
|
|
|
|
|
|
SUBJECT (DATE)
|
|
|
|
|
|
2011-11-09 13:05:00 +00:00
|
|
|
|
----------------------------------------------------------------
|
|
|
|
|
VERSION
|
|
|
|
|
|
2011-09-16 18:37:08 +00:00
|
|
|
|
----------------------------------------------------------------
|
2010-04-24 12:11:51 +00:00
|
|
|
|
SHORTLOG
|
|
|
|
|
|
|
|
|
|
DIFFSTAT
|
|
|
|
|
EOT
|
|
|
|
|
(
|
|
|
|
|
cd local &&
|
|
|
|
|
git checkout initial &&
|
|
|
|
|
git merge --ff-only master &&
|
2014-01-23 22:23:43 +00:00
|
|
|
|
git push origin tags/full &&
|
|
|
|
|
git request-pull initial "$downstream_url" tags/full >../request
|
2010-04-24 12:11:51 +00:00
|
|
|
|
) &&
|
|
|
|
|
<request sed -nf fuzz.sed >request.fuzzy &&
|
2014-02-25 21:44:46 +00:00
|
|
|
|
test_i18ncmp expect request.fuzzy &&
|
2010-04-24 12:11:51 +00:00
|
|
|
|
|
2014-02-25 21:44:46 +00:00
|
|
|
|
(
|
|
|
|
|
cd local &&
|
|
|
|
|
git request-pull initial "$downstream_url" tags/full:refs/tags/full
|
|
|
|
|
) >request &&
|
|
|
|
|
sed -nf fuzz.sed <request >request.fuzzy &&
|
2014-05-16 17:18:25 +00:00
|
|
|
|
test_i18ncmp expect request.fuzzy &&
|
|
|
|
|
|
|
|
|
|
(
|
|
|
|
|
cd local &&
|
|
|
|
|
git request-pull initial "$downstream_url" full
|
|
|
|
|
) >request &&
|
2014-06-02 07:06:56 +00:00
|
|
|
|
grep " tags/full\$" request
|
2010-04-24 12:11:51 +00:00
|
|
|
|
'
|
|
|
|
|
|
2010-04-24 12:15:37 +00:00
|
|
|
|
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 &&
|
2014-01-23 22:23:43 +00:00
|
|
|
|
git request-pull -- initial "$downstream_url" master:for-upstream >../request
|
2010-04-24 12:15:37 +00:00
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2019-05-28 10:15:42 +00:00
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2019-05-28 10:15:43 +00:00
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2010-04-24 12:11:51 +00:00
|
|
|
|
test_done
|