Correct handling of upload-pack in builtin-fetch-pack

The field in the args was being ignored in favor of a static constant

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

diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c
index 8f25d509a0b1bace78d0cb3f2a219b23e8b66d18..8753840a825d35249fa74ee80867f2dfd542708b 100644 (file)
--- a/builtin-fetch-pack.c
+++ b/builtin-fetch-pack.c
@@ -11,11 +11,12 @@
 static int transfer_unpack_limit = -1;
 static int fetch_unpack_limit = -1;
 static int unpack_limit = 100;
 static int transfer_unpack_limit = -1;
 static int fetch_unpack_limit = -1;
 static int unpack_limit = 100;

-static struct fetch_pack_args args;
+static struct fetch_pack_args args = {
+       /* .uploadpack = */ "git-upload-pack",
+};

 
 static const char fetch_pack_usage[] =
 "git-fetch-pack [--all] [--quiet|-q] [--keep|-k] [--thin] [--upload-pack=<git-upload-pack>] [--depth=<n>] [--no-progress] [-v] [<host>:]<directory> [<refs>...]";
 
 static const char fetch_pack_usage[] =
 "git-fetch-pack [--all] [--quiet|-q] [--keep|-k] [--thin] [--upload-pack=<git-upload-pack>] [--depth=<n>] [--no-progress] [-v] [<host>:]<directory> [<refs>...]";

-static const char *uploadpack = "git-upload-pack";

 
 #define COMPLETE       (1U << 0)
 #define COMMON         (1U << 1)
 
 #define COMPLETE       (1U << 0)
 #define COMMON         (1U << 1)


@@ -773,7 +774,7 @@ struct ref *fetch_pack(struct fetch_pack_args *my_args,
                        st.st_mtime = 0;
        }
 
                        st.st_mtime = 0;
        }
 

-       pid = git_connect(fd, (char *)dest, uploadpack,
+       pid = git_connect(fd, (char *)dest, args.uploadpack,

                           args.verbose ? CONNECT_VERBOSE : 0);
        if (pid < 0)
                return NULL;
                           args.verbose ? CONNECT_VERBOSE : 0);
        if (pid < 0)
                return NULL;