diff options
| -rw-r--r-- | builtin-fetch-pack.c | 19 | ||||
| -rw-r--r-- | transport.c | 9 | ||||
| -rw-r--r-- | transport.h | 3 |
3 files changed, 13 insertions, 18 deletions
diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c index 77eb181b5f..8f25d509a0 100644 --- a/builtin-fetch-pack.c +++ b/builtin-fetch-pack.c @@ -670,18 +670,24 @@ static int fetch_pack_config(const char *var, const char *value) static struct lock_file lock; -int cmd_fetch_pack(int argc, const char **argv, const char *prefix) +static void fetch_pack_setup(void) { - int i, ret, nr_heads; - struct ref *ref; - char *dest = NULL, **heads; - + static int did_setup; + if (did_setup) + return; git_config(fetch_pack_config); - if (0 <= transfer_unpack_limit) unpack_limit = transfer_unpack_limit; else if (0 <= fetch_unpack_limit) unpack_limit = fetch_unpack_limit; + did_setup = 1; +} + +int cmd_fetch_pack(int argc, const char **argv, const char *prefix) +{ + int i, ret, nr_heads; + struct ref *ref; + char *dest = NULL, **heads; nr_heads = 0; heads = NULL; @@ -760,6 +766,7 @@ struct ref *fetch_pack(struct fetch_pack_args *my_args, struct ref *ref; struct stat st; + fetch_pack_setup(); memcpy(&args, my_args, sizeof(args)); if (args.depth > 0) { if (stat(git_path("shallow"), &st)) diff --git a/transport.c b/transport.c index 85f5b1ed4c..a1d0a3c899 100644 --- a/transport.c +++ b/transport.c @@ -242,11 +242,7 @@ static int close_bundle(struct transport *transport) struct git_transport_data { unsigned thin : 1; unsigned keep : 1; - - int unpacklimit; - int depth; - const char *uploadpack; const char *receivepack; }; @@ -267,9 +263,6 @@ static int set_git_option(struct transport *connection, } else if (!strcmp(name, TRANS_OPT_KEEP)) { data->keep = !!value; return 0; - } else if (!strcmp(name, TRANS_OPT_UNPACKLIMIT)) { - data->unpacklimit = atoi(value); - return 0; } else if (!strcmp(name, TRANS_OPT_DEPTH)) { if (!value) data->depth = 0; @@ -318,7 +311,6 @@ static int fetch_refs_via_pack(struct transport *transport, args.uploadpack = data->uploadpack; args.keep_pack = data->keep; args.lock_pack = 1; - args.unpacklimit = data->unpacklimit; args.use_thin_pack = data->thin; args.verbose = transport->verbose; args.depth = data->depth; @@ -435,7 +427,6 @@ struct transport *transport_get(struct remote *remote, const char *url) data->receivepack = "git-receive-pack"; if (remote && remote->receivepack) data->receivepack = remote->receivepack; - data->unpacklimit = -1; } return ret; diff --git a/transport.h b/transport.h index 3e332ff53a..6e318e4e8c 100644 --- a/transport.h +++ b/transport.h @@ -47,9 +47,6 @@ struct transport *transport_get(struct remote *, const char *); /* Keep the pack that was transferred if not null */ #define TRANS_OPT_KEEP "keep" -/* Unpack the objects if fewer than this number of objects are fetched */ -#define TRANS_OPT_UNPACKLIMIT "unpacklimit" - /* Limit the depth of the fetch if not null */ #define TRANS_OPT_DEPTH "depth" |