t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"

diff --git a/transport-helper.c b/transport-helper.c
index f0d7fc772cc76a8f3fc59cda58179819ed2613b9..b468e4f88e730f88a1d231a574585ace56e7066a 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -195,15 +195,9 @@ static struct child_process *get_helper(struct transport *transport)
                } else if (!strcmp(capname, "signed-tags")) {
                        data->signed_tags = 1;
                } else if (starts_with(capname, "export-marks ")) {
-                       struct strbuf arg = STRBUF_INIT;
-                       strbuf_addstr(&arg, "--export-marks=");
-                       strbuf_addstr(&arg, capname + strlen("export-marks "));
-                       data->export_marks = strbuf_detach(&arg, NULL);
+                       data->export_marks = xstrdup(capname + strlen("export-marks "));
                } else if (starts_with(capname, "import-marks")) {
-                       struct strbuf arg = STRBUF_INIT;
-                       strbuf_addstr(&arg, "--import-marks=");
-                       strbuf_addstr(&arg, capname + strlen("import-marks "));
-                       data->import_marks = strbuf_detach(&arg, NULL);
+                       data->import_marks = xstrdup(capname + strlen("import-marks "));
                } else if (starts_with(capname, "no-private-update")) {
                        data->no_private_update = 1;
                } else if (mandatory) {
@@ -428,6 +422,8 @@ static int get_exporter(struct transport *transport,
        struct helper_data *data = transport->data;
        struct child_process *helper = get_helper(transport);
        int argc = 0, i;
+       struct strbuf tmp = STRBUF_INIT;
+
        memset(fastexport, 0, sizeof(*fastexport));
 
        /* we need to duplicate helper->in because we want to use it after
@@ -438,10 +434,14 @@ static int get_exporter(struct transport *transport,
        fastexport->argv[argc++] = "--use-done-feature";
        fastexport->argv[argc++] = data->signed_tags ?
                "--signed-tags=verbatim" : "--signed-tags=warn-strip";
-       if (data->export_marks)
-               fastexport->argv[argc++] = data->export_marks;
-       if (data->import_marks)
-               fastexport->argv[argc++] = data->import_marks;
+       if (data->export_marks) {
+               strbuf_addf(&tmp, "--export-marks=%s.tmp", data->export_marks);
+               fastexport->argv[argc++] = strbuf_detach(&tmp, NULL);
+       }
+       if (data->import_marks) {
+               strbuf_addf(&tmp, "--import-marks=%s", data->import_marks);
+               fastexport->argv[argc++] = strbuf_detach(&tmp, NULL);
+       }
 
        for (i = 0; i < revlist_args->nr; i++)
                fastexport->argv[argc++] = revlist_args->items[i].string;
@@ -739,17 +739,22 @@ static int push_update_ref_status(struct strbuf *buf,
        return !(status == REF_STATUS_OK);
 }
 
-static void push_update_refs_status(struct helper_data *data,
+static int push_update_refs_status(struct helper_data *data,
                                    struct ref *remote_refs,
                                    int flags)
 {
        struct strbuf buf = STRBUF_INIT;
        struct ref *ref = remote_refs;
+       int ret = 0;
+
        for (;;) {
                char *private;
 
-               if (recvline(data, &buf))
-                       exit(128);
+               if (recvline(data, &buf)) {
+                       ret = 1;
+                       break;
+               }
+
                if (!buf.len)
                        break;
 
@@ -767,6 +772,7 @@ static void push_update_refs_status(struct helper_data *data,
                free(private);
        }
        strbuf_release(&buf);
+       return ret;
 }
 
 static int push_refs_with_push(struct transport *transport,
@@ -847,8 +853,7 @@ static int push_refs_with_push(struct transport *transport,
        sendline(data, &buf);
        strbuf_release(&buf);
 
-       push_update_refs_status(data, remote_refs, flags);
-       return 0;
+       return push_update_refs_status(data, remote_refs, flags);
 }
 
 static int push_refs_with_export(struct transport *transport,
@@ -906,7 +911,15 @@ static int push_refs_with_export(struct transport *transport,
 
        if (finish_command(&exporter))
                die("Error while running fast-export");
-       push_update_refs_status(data, remote_refs, flags);
+       if (push_update_refs_status(data, remote_refs, flags))
+               return 1;
+
+       if (data->export_marks) {
+               strbuf_addf(&buf, "%s.tmp", data->export_marks);
+               rename(buf.buf, data->export_marks);
+               strbuf_release(&buf);
+       }
+
        return 0;
 }