mirror of
https://github.com/git/git.git
synced 2024-10-31 22:37:54 +01:00
438fc68462
When using non-builtin protocols relying on a transport helper (such as http), push options are not propagated to the helper. The user could ask for push options and a push would seemingly succeed, but the push options would never be transported to the server, misleading the users expectation. Fix this by propagating the push options to the transport helper. This is only addressing the first issue of (1) the helper protocol does not propagate push-option (2) the http helper is not prepared to handle push-option Once we fix (2), the http transport helper can make use of push options as well, but that happens as a follow up. (1) is a bug fix, whereas (2) is a feature, which is why we only do (1) here. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
118 lines
3.1 KiB
Bash
Executable file
118 lines
3.1 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='pushing to a repository using push options'
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
|
start_httpd
|
|
|
|
mk_repo_pair () {
|
|
rm -rf workbench upstream &&
|
|
test_create_repo upstream &&
|
|
test_create_repo workbench &&
|
|
(
|
|
cd upstream &&
|
|
git config receive.denyCurrentBranch warn &&
|
|
mkdir -p .git/hooks &&
|
|
cat >.git/hooks/pre-receive <<-'EOF' &&
|
|
#!/bin/sh
|
|
if test -n "$GIT_PUSH_OPTION_COUNT"; then
|
|
i=0
|
|
>hooks/pre-receive.push_options
|
|
while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"; do
|
|
eval "value=\$GIT_PUSH_OPTION_$i"
|
|
echo $value >>hooks/pre-receive.push_options
|
|
i=$((i + 1))
|
|
done
|
|
fi
|
|
EOF
|
|
chmod u+x .git/hooks/pre-receive
|
|
|
|
cat >.git/hooks/post-receive <<-'EOF' &&
|
|
#!/bin/sh
|
|
if test -n "$GIT_PUSH_OPTION_COUNT"; then
|
|
i=0
|
|
>hooks/post-receive.push_options
|
|
while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"; do
|
|
eval "value=\$GIT_PUSH_OPTION_$i"
|
|
echo $value >>hooks/post-receive.push_options
|
|
i=$((i + 1))
|
|
done
|
|
fi
|
|
EOF
|
|
chmod u+x .git/hooks/post-receive
|
|
) &&
|
|
(
|
|
cd workbench &&
|
|
git remote add up ../upstream
|
|
)
|
|
}
|
|
|
|
# Compare the ref ($1) in upstream with a ref value from workbench ($2)
|
|
# i.e. test_refs second HEAD@{2}
|
|
test_refs () {
|
|
test $# = 2 &&
|
|
git -C upstream rev-parse --verify "$1" >expect &&
|
|
git -C workbench rev-parse --verify "$2" >actual &&
|
|
test_cmp expect actual
|
|
}
|
|
|
|
test_expect_success 'one push option works for a single branch' '
|
|
mk_repo_pair &&
|
|
git -C upstream config receive.advertisePushOptions true &&
|
|
(
|
|
cd workbench &&
|
|
test_commit one &&
|
|
git push --mirror up &&
|
|
test_commit two &&
|
|
git push --push-option=asdf up master
|
|
) &&
|
|
test_refs master master &&
|
|
echo "asdf" >expect &&
|
|
test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
|
|
test_cmp expect upstream/.git/hooks/post-receive.push_options
|
|
'
|
|
|
|
test_expect_success 'push option denied by remote' '
|
|
mk_repo_pair &&
|
|
git -C upstream config receive.advertisePushOptions false &&
|
|
(
|
|
cd workbench &&
|
|
test_commit one &&
|
|
git push --mirror up &&
|
|
test_commit two &&
|
|
test_must_fail git push --push-option=asdf up master
|
|
) &&
|
|
test_refs master HEAD@{1}
|
|
'
|
|
|
|
test_expect_success 'two push options work' '
|
|
mk_repo_pair &&
|
|
git -C upstream config receive.advertisePushOptions true &&
|
|
(
|
|
cd workbench &&
|
|
test_commit one &&
|
|
git push --mirror up &&
|
|
test_commit two &&
|
|
git push --push-option=asdf --push-option="more structured text" up master
|
|
) &&
|
|
test_refs master master &&
|
|
printf "asdf\nmore structured text\n" >expect &&
|
|
test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
|
|
test_cmp expect upstream/.git/hooks/post-receive.push_options
|
|
'
|
|
|
|
test_expect_success 'push option denied properly by http remote helper' '\
|
|
mk_repo_pair &&
|
|
git -C upstream config receive.advertisePushOptions false &&
|
|
git -C upstream config http.receivepack true &&
|
|
cp -R upstream/.git "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git &&
|
|
git clone "$HTTPD_URL"/smart/upstream test_http_clone &&
|
|
test_commit -C test_http_clone one &&
|
|
test_must_fail git -C test_http_clone push --push-option=asdf origin master &&
|
|
git -C test_http_clone push origin master
|
|
'
|
|
|
|
stop_httpd
|
|
|
|
test_done
|