diff options
| author | Daniel Barkalow <barkalow@iabervon.org> | 2007-10-29 22:35:08 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-29 20:32:22 -0700 |
| commit | 09149c7809a37a52b38d8d7a0621e2fb8943d8fe (patch) | |
| tree | b0b2f1a8931e30dd6a85ca170329cb7743ea372a | |
| parent | 68492fc73b7387fa72d09545f5743728c5fdb419 (diff) | |
| download | git-09149c7809a37a52b38d8d7a0621e2fb8943d8fe.tar.gz git-09149c7809a37a52b38d8d7a0621e2fb8943d8fe.tar.xz | |
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>
| -rw-r--r-- | builtin-fetch-pack.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c index 8f25d509a..8753840a8 100644 --- 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 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 *uploadpack = "git-upload-pack"; #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; } - 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; |