mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sb/push-options-via-transport'

Browse Source 
The push-options given via the "--push-options" option were not
passed through to external remote helpers such as "smart HTTP" that
are invoked via the transport helper.

* sb/push-options-via-transport:
  push options: pass push options to the transport helper
This commit is contained in:
Junio C Hamano
2017-02-15 12:54:19 -08:00
parent 3f4ccb5a57 438fc68462
commit ca3c2b85d1
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
t/t5545-push-options.sh
View File

@ -3,6 +3,8 @@
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 &&
@ -100,4 +102,17 @@ test_expect_success 'two push options work' '
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