From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 15 Apr 2025 20:50:14 +0000 (-0700)
Subject: Merge branch 'ps/object-wo-the-repository'
X-Git-Tag: v2.50.0-rc0~125
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee847e0034dbfde11f901fbfb74d210c1edad496;p=thirdparty%2Fgit.git

Merge branch 'ps/object-wo-the-repository'

The object layer has been updated to take an explicit repository
instance as a parameter in more code paths.

* ps/object-wo-the-repository:
  hash: stop depending on `the_repository` in `null_oid()`
  hash: fix "-Wsign-compare" warnings
  object-file: split out logic regarding hash algorithms
  delta-islands: stop depending on `the_repository`
  object-file-convert: stop depending on `the_repository`
  pack-bitmap-write: stop depending on `the_repository`
  pack-revindex: stop depending on `the_repository`
  pack-check: stop depending on `the_repository`
  environment: move access to "core.bigFileThreshold" into repo settings
  pack-write: stop depending on `the_repository` and `the_hash_algo`
  object: stop depending on `the_repository`
  csum-file: stop depending on `the_repository`
---

ee847e0034dbfde11f901fbfb74d210c1edad496
diff --cc midx-write.c
index 0897cbd829,a628ac24dc..48a4dc5e94
--- a/midx-write.c
+++ b/midx-write.c
@@@ -656,15 -655,10 +656,15 @@@ static void write_midx_reverse_index(st
  
  	trace2_region_enter("midx", "write_midx_reverse_index", ctx->repo);
  
 -	strbuf_addf(&buf, "%s-%s.rev", midx_name, hash_to_hex_algop(midx_hash,
 -								    ctx->repo->hash_algo));
 +	if (ctx->incremental)
 +		get_split_midx_filename_ext(ctx->repo->hash_algo, &buf,
 +					    object_dir, midx_hash,
 +					    MIDX_EXT_REV);
 +	else
 +		get_midx_filename_ext(ctx->repo->hash_algo, &buf, object_dir,
 +				      midx_hash, MIDX_EXT_REV);
  
- 	tmp_file = write_rev_file_order(ctx->repo->hash_algo, NULL, ctx->pack_order,
+ 	tmp_file = write_rev_file_order(ctx->repo, NULL, ctx->pack_order,
  					ctx->entries_nr, midx_hash, WRITE_REV);
  
  	if (finalize_object_file(tmp_file, buf.buf))
diff --cc object-file.c
index 8da62fed0b,772c311f18..f3810871f0
--- a/object-file.c
+++ b/object-file.c
@@@ -3131,12 -2858,14 +2856,13 @@@ int read_loose_object(const char *path
  
  	if (parse_loose_header(hdr, oi) < 0) {
  		error(_("unable to parse header of %s"), path);
 -		git_inflate_end(&stream);
 -		goto out;
 +		goto out_inflate;
  	}
  
- 	if (*oi->typep == OBJ_BLOB && *size > big_file_threshold) {
+ 	if (*oi->typep == OBJ_BLOB &&
+ 	    *size > repo_settings_get_big_file_threshold(the_repository)) {
  		if (check_stream_oid(&stream, hdr, *size, path, expected_oid) < 0)
 -			goto out;
 +			goto out_inflate;
  	} else {
  		*contents = unpack_loose_rest(&stream, hdr, *size, expected_oid);
  		if (!*contents) {
diff --cc pack-revindex.c
index d3faab6a37,038e0c96b1..f035a33a5a
--- a/pack-revindex.c
+++ b/pack-revindex.c
@@@ -380,19 -386,14 +386,20 @@@ int load_midx_revindex(struct multi_pac
  		return 0;
  	}
  
- 	trace2_data_string("load_midx_revindex", the_repository,
+ 	trace2_data_string("load_midx_revindex", m->repo,
  			   "source", "rev");
  
 -	get_midx_filename_ext(m->repo->hash_algo, &revindex_name, m->object_dir,
 -			      get_midx_checksum(m), MIDX_EXT_REV);
 +	if (m->has_chain)
 +		get_split_midx_filename_ext(m->repo->hash_algo, &revindex_name,
 +					    m->object_dir, get_midx_checksum(m),
 +					    MIDX_EXT_REV);
 +	else
 +		get_midx_filename_ext(m->repo->hash_algo, &revindex_name,
 +				      m->object_dir, get_midx_checksum(m),
 +				      MIDX_EXT_REV);
  
- 	ret = load_revindex_from_disk(revindex_name.buf,
+ 	ret = load_revindex_from_disk(m->repo->hash_algo,
+ 				      revindex_name.buf,
  				      m->num_objects,
  				      &m->revindex_map,
  				      &m->revindex_len);