mirror of
https://github.com/git/git.git
synced 2024-10-30 13:57:54 +01:00
7f814632f5
"git diff --stat" and "git apply --stat" now learn to print the line "%d files changed, %d insertions(+), %d deletions(-)" in singular form whenever applicable. "0 insertions" and "0 deletions" are also omitted unless they are both zero. This matches how versions of "diffstat" that are not prehistoric produced their output, and also makes this line translatable. [jc: with help from Thomas Dickey in archaeology of "diffstat"] [jc: squashed Jonathan's updates to illustrations in tutorials and a test] Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
241 lines
5.1 KiB
Bash
Executable file
241 lines
5.1 KiB
Bash
Executable file
#!/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
|
|
# 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/$_x40/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/$downstream_url_for_sed/URL/g
|
|
s/for-upstream/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 branch of.*is at:\$" 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 >../request
|
|
) &&
|
|
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
|
|
|
|
'
|
|
|
|
test_expect_success 'request names an appropriate branch' '
|
|
|
|
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 &&
|
|
{
|
|
test "$branch" = full ||
|
|
test "$branch" = master ||
|
|
test "$branch" = for-upstream
|
|
}
|
|
|
|
'
|
|
|
|
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 master:for-upstream &&
|
|
git request-pull initial "$downstream_url" >../request
|
|
) &&
|
|
<request sed -nf fuzz.sed >request.fuzzy &&
|
|
test_cmp expect request.fuzzy
|
|
|
|
'
|
|
|
|
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" >../request
|
|
)
|
|
|
|
'
|
|
|
|
test_done
|