diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-10-23 14:43:11 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-23 14:43:11 +0900 |
| commit | d45d771978c3d5bead096934cad16ddfb9fced37 (patch) | |
| tree | d37c8a011d0599f989ea378b5860f9b3e4e5996f /transport-helper.c | |
| parent | Merge branch 'wb/fsmonitor-bitmap-fix' (diff) | |
| parent | remote-curl: pass on atomic capability to remote side (diff) | |
| download | tgif-d45d771978c3d5bead096934cad16ddfb9fced37.tar.xz | |
Merge branch 'bc/smart-http-atomic-push'
The atomic push over smart HTTP transport did not work, which has
been corrected.
* bc/smart-http-atomic-push:
remote-curl: pass on atomic capability to remote side
Diffstat (limited to 'transport-helper.c')
| -rw-r--r-- | transport-helper.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/transport-helper.c b/transport-helper.c index 9e1279b928..a9d690297e 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -854,6 +854,10 @@ static void set_common_push_options(struct transport *transport, die(_("helper %s does not support --signed=if-asked"), name); } + if (flags & TRANSPORT_PUSH_ATOMIC) + if (set_helper_option(transport, TRANS_OPT_ATOMIC, "true") != 0) + die(_("helper %s does not support --atomic"), name); + if (flags & TRANSPORT_PUSH_OPTIONS) { struct string_list_item *item; for_each_string_list_item(item, transport->push_options) |