Sync with 2.23.1

[thirdparty/git.git] / transport-helper.c

diff --git a/transport-helper.c b/transport-helper.c
index 9e1279b928bb3eadf110e43c091b4a3ba789fe3b..413d9d873e8623ac40ee3c5912d80d5fb2534722 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -435,6 +435,7 @@ static int get_importer(struct transport *transport, struct child_process *fasti
        child_process_init(fastimport);
        fastimport->in = xdup(helper->out);
        argv_array_push(&fastimport->args, "fast-import");
+       argv_array_push(&fastimport->args, "--allow-unsafe-features");
        argv_array_push(&fastimport->args, debug ? "--stats" : "--quiet");
 
        if (data->bidi_import) {
@@ -854,6 +855,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)