diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-02-15 23:54:19 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-02-15 23:54:19 +0300 |
commit | ca3c2b85d1b081380f3768fa08ca84e7dd7ffa89 (patch) | |
tree | 288b680cea43912fe62dc1910ab76a50d43182f0 /transport-helper.c | |
parent | 3f4ccb5a579740382fa7685e6d1a00d157b44387 (diff) | |
parent | 438fc68462d5839ef6ca231cdcb411105eaf0ba2 (diff) |
Merge branch 'sb/push-options-via-transport'
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
Diffstat (limited to 'transport-helper.c')
-rw-r--r-- | transport-helper.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/transport-helper.c b/transport-helper.c index 91aed35ebb..1258d6aedd 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -826,6 +826,13 @@ static void set_common_push_options(struct transport *transport, if (set_helper_option(transport, TRANS_OPT_PUSH_CERT, "if-asked") != 0) die("helper %s does not support --signed=if-asked", name); } + + if (flags & TRANSPORT_PUSH_OPTIONS) { + struct string_list_item *item; + for_each_string_list_item(item, transport->push_options) + if (set_helper_option(transport, "push-option", item->string) != 0) + die("helper %s does not support 'push-option'", name); + } } static int push_refs_with_push(struct transport *transport, |