From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Jul 2026 17:31:46 +0000 (-0700)
Subject: Merge branch 'rs/tempfile-wo-the-repository' into next
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=968a116891c15f6df5a7a84720f75c13a338b0f8;p=thirdparty%2Fgit.git

Merge branch 'rs/tempfile-wo-the-repository' into next

The tempfile and lockfile APIs have been refactored to stop depending
on the 'the_repository' global variable, and their callers have been
updated to use the repository-aware variants.

* rs/tempfile-wo-the-repository:
  use repo_hold_lock_file_for_update{,_mode,_timeout}() with custom repos
  tempfile: stop using the_repository
  lockfile: add repo_hold_lock_file_for_update{,_timeout}{,_mode}()
  refs/packed: use repo_create_tempfile()
  tempfile: add repo_create_tempfile{,_mode}()
---

968a116891c15f6df5a7a84720f75c13a338b0f8
diff --cc refs/packed-backend.c
index c5d96793fa,117f2d4368..b9b04b7010
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@@ -1252,10 -1232,9 +1252,9 @@@ int packed_refs_lock(struct ref_store *
  	 * don't write new content to it, but rather to a separate
  	 * tempfile.
  	 */
- 	if (hold_lock_file_for_update_timeout(
- 			    &refs->lock,
- 			    refs->path,
- 			    flags, refs->timeout_value) < 0) {
+ 	if (repo_hold_lock_file_for_update_timeout(ref_store->repo, &refs->lock,
+ 						   refs->path, flags,
 -						   timeout_value) < 0) {
++						   refs->timeout_value) < 0) {
  		unable_to_lock_message(refs->path, errno, err);
  		return -1;
  	}