kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

builtin/receive-pack: read unpack limit config lazily 

In git-receive-pack(1), the `receive.unpackLimit` and
`transfer.unpackLimit` configuration decides whether an incoming
packfile should be exploded into loose objects or kept as a packfile
on-disk. In a subsequent commit, the logic to write the incoming
packfile is made ODB backend agnostic and moved behind a pluggable ODB
transaction interface. Consequently, whether to explode a packfile is a
detail of how a particular backend stores objects and should not be a
part of the generic interface itself.

In preparation for this, instead resolve the unpack limit lazily inside
`unpack()` by reading the configuration directly. The now-unused unpack
limit globals are dropped accordingly.

Signed-off-by: Justin Tobler <jltobler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
main
Justin Tobler 2026-08-20 18:49:35 -05:00 committed by Junio C Hamano
parent 727b99cdb1
commit c59466d4cf
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
builtin/receive-pack.c
View File

@ -62,12 +62,9 @@ static enum deny_action deny_delete_current = DENY_UNCONFIGURED;
static int receive_fsck_objects = -1;
static int transfer_fsck_objects = -1;
static struct strbuf fsck_msg_types = STRBUF_INIT;
static int receive_unpack_limit = -1;
static int transfer_unpack_limit = -1;
static int advertise_atomic_push = 1;
static int advertise_push_options;
static int advertise_sid;
static int unpack_limit = 100;
static off_t max_input_size;
static int report_status;
static int report_status_v2;
@ -157,16 +154,6 @@ static int receive_pack_config(const char *var, const char *value,
return 0;
}

if (strcmp(var, "receive.unpacklimit") == 0) {
receive_unpack_limit = git_config_int(var, value, ctx->kvi);
return 0;
}

if (strcmp(var, "transfer.unpacklimit") == 0) {
transfer_unpack_limit = git_config_int(var, value, ctx->kvi);
return 0;
}

if (strcmp(var, "receive.fsck.skiplist") == 0) {
char *path;

@ -2333,6 +2320,16 @@ static void push_header_arg(struct strvec *args, struct pack_header *hdr)
ntohl(hdr->hdr_version), ntohl(hdr->hdr_entries));
}

static unsigned int get_unpack_limit(struct repository *repo)
{
unsigned int limit = 100;

repo_config_get_uint(repo, "transfer.unpacklimit", &limit);
repo_config_get_uint(repo, "receive.unpacklimit", &limit);

return limit;
}

static const char *unpack(struct odb_transaction *transaction,
const char *shallow_file, int err_fd)
{
@ -2360,7 +2357,7 @@ static const char *unpack(struct odb_transaction *transaction,

odb_transaction_env(transaction, &child.env);

if (ntohl(hdr.hdr_entries) < unpack_limit) {
if (ntohl(hdr.hdr_entries) < get_unpack_limit(the_repository)) {
strvec_push(&child.args, "unpack-objects");
push_header_arg(&child.args, &hdr);
if (quiet)
@ -2658,11 +2655,6 @@ int cmd_receive_pack(int argc,
if (cert_nonce_seed)
push_cert_nonce = prepare_push_cert_nonce(service_dir, time(NULL));

if (0 <= receive_unpack_limit)
unpack_limit = receive_unpack_limit;
else if (0 <= transfer_unpack_limit)
unpack_limit = transfer_unpack_limit;

switch (determine_protocol_version_server()) {
case protocol_v2:
/*