summaryrefslogtreecommitdiff
path: root/transport.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-03 22:10:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-08-03 22:10:24 (GMT)
commitcf27c7996e986395a05c0056684923195295fd14 (patch)
tree91c7d576445ca71e9eba9d11bfaddd353a326ab5 /transport.c
parent4067a45438282fe967779fcbc5c3513d2cbb5913 (diff)
parent3ac870300a7bb430341388a8f2ec465328986617 (diff)
downloadgit-cf27c7996e986395a05c0056684923195295fd14.zip
git-cf27c7996e986395a05c0056684923195295fd14.tar.gz
git-cf27c7996e986395a05c0056684923195295fd14.tar.bz2
Merge branch 'sb/push-options'
"git push" learned to accept and pass extra options to the receiving end so that hooks can read and react to them. * sb/push-options: add a test for push options push: accept push options receive-pack: implement advertising and receiving push options push options: {pre,post}-receive hook learns about push options
Diffstat (limited to 'transport.c')
-rw-r--r--transport.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/transport.c b/transport.c
index b233e3e..4ba48b0 100644
--- a/transport.c
+++ b/transport.c
@@ -513,6 +513,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN);
args.porcelain = !!(flags & TRANSPORT_PUSH_PORCELAIN);
args.atomic = !!(flags & TRANSPORT_PUSH_ATOMIC);
+ args.push_options = transport->push_options;
args.url = transport->url;
if (flags & TRANSPORT_PUSH_CERT_ALWAYS)