Add branch --set-upstream

diff --git a/builtin-archive.c b/builtin-archive.c
index 12351e9dd5c481fddc8db07c00a211b4620250bd..3fb41364a512db28c92d79a21c60b238141c7970 100644 (file)
--- a/builtin-archive.c
+++ b/builtin-archive.c
@@ -5,6 +5,7 @@
 #include "cache.h"
 #include "builtin.h"
 #include "archive.h"
+#include "transport.h"
 #include "parse-options.h"
 #include "pkt-line.h"
 #include "sideband.h"
@@ -25,12 +26,16 @@ static void create_output_file(const char *output_file)
 static int run_remote_archiver(int argc, const char **argv,
                               const char *remote, const char *exec)
 {
-       char *url, buf[LARGE_PACKET_MAX];
+       char buf[LARGE_PACKET_MAX];
        int fd[2], i, len, rv;
-       struct child_process *conn;
+       struct transport *transport;
+       struct remote *_remote;
 
-       url = xstrdup(remote);
-       conn = git_connect(fd, url, exec, 0);
+       _remote = remote_get(remote);
+       if (!_remote->url[0])
+               die("git archive: Remote with no URL");
+       transport = transport_get(_remote, _remote->url[0]);
+       transport_connect(transport, "git-upload-archive", exec, fd);
 
        for (i = 1; i < argc; i++)
                packet_write(fd[1], "argument %s\n", argv[i]);
@@ -53,9 +58,7 @@ static int run_remote_archiver(int argc, const char **argv,
 
        /* Now, start reading from fd[0] and spit it out to stdout */
        rv = recv_sideband("archive", fd[0], 1);
-       close(fd[0]);
-       close(fd[1]);
-       rv |= finish_connect(conn);
+       rv |= transport_disconnect(transport);
 
        return !!rv;
 }
@@ -106,13 +109,17 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
        if (format) {
                sprintf(fmt_opt, "--format=%s", format);
                /*
-                * This is safe because either --format and/or --output must
-                * have been given on the original command line if we get to
-                * this point, and parse_options() must have eaten at least
-                * one argument, i.e. we have enough room to append to argv[].
+                * We have enough room in argv[] to muck it in place,
+                * because either --format and/or --output must have
+                * been given on the original command line if we get
+                * to this point, and parse_options() must have eaten
+                * it, i.e. we can add back one element to the array.
+                * But argv[] may contain "--"; we should make it the
+                * first option.
                 */
-               argv[argc++] = fmt_opt;
-               argv[argc] = NULL;
+               memmove(argv + 2, argv + 1, sizeof(*argv) * argc);
+               argv[1] = fmt_opt;
+               argv[++argc] = NULL;
        }
 
        if (remote)