bulk-checkin: replace fast-import based implementation

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 40a1675997cee19afb77b94bdd514fb5bc9a27bc..e0b8030f2b31ee337bc2d2e0925788ec6cd92e0f 100644 (file)
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -334,7 +334,7 @@ int send_pack(struct send_pack_args *args,
                demux.data = fd;
                demux.out = -1;
                if (start_async(&demux))
-                       die("receive-pack: unable to fork off sideband demultiplexer");
+                       die("send-pack: unable to fork off sideband demultiplexer");
                in = demux.out;
        }
 
@@ -439,10 +439,6 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
                                args.force_update = 1;
                                continue;
                        }
-                       if (!strcmp(arg, "--quiet")) {
-                               args.quiet = 1;
-                               continue;
-                       }
                        if (!strcmp(arg, "--verbose")) {
                                args.verbose = 1;
                                continue;
@@ -492,13 +488,8 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
                fd[0] = 0;
                fd[1] = 1;
        } else {
-               struct strbuf sb = STRBUF_INIT;
-               strbuf_addstr(&sb, receivepack);
-               if (args.quiet)
-                       strbuf_addstr(&sb, " --quiet");
-               conn = git_connect(fd, dest, sb.buf,
+               conn = git_connect(fd, dest, receivepack,
                        args.verbose ? CONNECT_VERBOSE : 0);
-               strbuf_release(&sb);
        }
 
        memset(&extra_have, 0, sizeof(extra_have));
@@ -518,7 +509,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
                flags |= MATCH_REFS_MIRROR;
 
        /* match them up */
-       if (match_refs(local_refs, &remote_refs, nr_refspecs, refspecs, flags))
+       if (match_push_refs(local_refs, &remote_refs, nr_refspecs, refspecs, flags))
                return -1;
 
        set_ref_status_for_push(remote_refs, args.send_mirror,