@matheusbsbs / matheus-bagliano / commits / 40cb4fab72
Fork 0

Use built-in send-pack.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Daniel Barkalow committed Oct 29, 2007 at 22:03 UTC 40cb4fab720807f8525fb125e6c4ddc802ee8ed1
1 file changed +10 -41
transport.c
+10 -41
@@ -6,6 +6,7 @@
6 #endif
7 #include "pkt-line.h"
8 #include "fetch-pack.h"
9 +#include "send-pack.h"
10 #include "walker.h"
11 #include "bundle.h"
12 #include "dir.h"
@@ -648,48 +649,16 @@ static int fetch_refs_via_pack(struct transport *transport,
649
650 static int git_transport_push(struct transport *transport, int refspec_nr, const char **refspec, int flags) {
651 struct git_transport_data *data = transport->data;
651 - const char **argv;
652 - char *rem;
653 - int argc;
654 - int err;
652 + struct send_pack_args args;
653
656 - argv = xmalloc((refspec_nr + 11) * sizeof(char *));
657 - argv[0] = "send-pack";
658 - argc = 1;
659 - if (flags & TRANSPORT_PUSH_ALL)
660 - argv[argc++] = "--all";
661 - if (flags & TRANSPORT_PUSH_FORCE)
662 - argv[argc++] = "--force";
663 - if (flags & TRANSPORT_PUSH_DRY_RUN)
664 - argv[argc++] = "--dry-run";
665 - if (data->receivepack) {
666 - char *rp = xmalloc(strlen(data->receivepack) + 16);
667 - sprintf(rp, "--receive-pack=%s", data->receivepack);
668 - argv[argc++] = rp;
669 - }
670 - if (data->thin)
671 - argv[argc++] = "--thin";
672 - rem = xmalloc(strlen(transport->remote->name) + 10);
673 - sprintf(rem, "--remote=%s", transport->remote->name);
674 - argv[argc++] = rem;
675 - argv[argc++] = transport->url;
676 - while (refspec_nr--)
677 - argv[argc++] = *refspec++;
678 - argv[argc] = NULL;
679 - err = run_command_v_opt(argv, RUN_GIT_CMD);
680 - switch (err) {
681 - case -ERR_RUN_COMMAND_FORK:
682 - error("unable to fork for %s", argv[0]);
683 - case -ERR_RUN_COMMAND_EXEC:
684 - error("unable to exec %s", argv[0]);
685 - break;
686 - case -ERR_RUN_COMMAND_WAITPID:
687 - case -ERR_RUN_COMMAND_WAITPID_WRONG_PID:
688 - case -ERR_RUN_COMMAND_WAITPID_SIGNAL:
689 - case -ERR_RUN_COMMAND_WAITPID_NOEXIT:
690 - error("%s died with strange error", argv[0]);
691 - }
692 - return !!err;
654 + args.receivepack = data->receivepack;
655 + args.send_all = !!(flags & TRANSPORT_PUSH_ALL);
656 + args.force_update = !!(flags & TRANSPORT_PUSH_FORCE);
657 + args.use_thin_pack = data->thin;
658 + args.verbose = transport->verbose;
659 + args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN);
660 +
661 + return send_pack(&args, transport->url, transport->remote, refspec_nr, refspec);
662 }
663
664 static int disconnect_git(struct transport *transport)