diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-01-24 17:02:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-24 18:08:02 -0800 |
| commit | e28714c527339a477fca226765163b9361d94285 (patch) | |
| tree | 73a590d0c86774ecb64fc93af67c630ad75d6f4d /receive-pack.c | |
| parent | af7cf268f0bf8d4216f9c11d1cb0082cb3550f61 (diff) | |
| download | git-e28714c527339a477fca226765163b9361d94285.tar.gz git-e28714c527339a477fca226765163b9361d94285.tar.xz | |
Consolidate {receive,fetch}.unpackLimit
This allows transfer.unpackLimit to specify what these two
configuration variables want to set.
We would probably want to deprecate the two separate variables,
as I do not see much point in specifying them independently.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'receive-pack.c')
| -rw-r--r-- | receive-pack.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/receive-pack.c b/receive-pack.c index b3a455269..8b59b3227 100644 --- a/receive-pack.c +++ b/receive-pack.c @@ -10,6 +10,8 @@ static const char receive_pack_usage[] = "git-receive-pack <git-dir>"; static int deny_non_fast_forwards = 0; +static int receive_unpack_limit = -1; +static int transfer_unpack_limit = -1; static int unpack_limit = 100; static int report_status; @@ -18,21 +20,22 @@ static int capabilities_sent; static int receive_pack_config(const char *var, const char *value) { - git_default_config(var, value); - - if (strcmp(var, "receive.denynonfastforwards") == 0) - { + if (strcmp(var, "receive.denynonfastforwards") == 0) { deny_non_fast_forwards = git_config_bool(var, value); return 0; } - if (strcmp(var, "receive.unpacklimit") == 0) - { - unpack_limit = git_config_int(var, value); + if (strcmp(var, "receive.unpacklimit") == 0) { + receive_unpack_limit = git_config_int(var, value); return 0; } - return 0; + if (strcmp(var, "transfer.unpacklimit") == 0) { + transfer_unpack_limit = git_config_int(var, value); + return 0; + } + + return git_default_config(var, value); } static int show_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data) @@ -431,6 +434,11 @@ int main(int argc, char **argv) ignore_missing_committer_name(); git_config(receive_pack_config); + if (0 <= transfer_unpack_limit) + unpack_limit = transfer_unpack_limit; + else if (0 <= receive_unpack_limit) + unpack_limit = receive_unpack_limit; + write_head_info(); /* EOF */ |