From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 May 2024 21:15:12 +0000 (-0700)
Subject: Merge branch 'ps/refs-without-the-repository-updates'
X-Git-Tag: v2.46.0-rc0~89
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=988499e2955f052fa5f58434e13d12285cb8a361;p=thirdparty%2Fgit.git

Merge branch 'ps/refs-without-the-repository-updates'

Further clean-up the refs subsystem to stop relying on
the_repository, and instead use the repository associated to the
ref_store object.

* ps/refs-without-the-repository-updates:
  refs/packed: remove references to `the_hash_algo`
  refs/files: remove references to `the_hash_algo`
  refs/files: use correct repository
  refs: remove `dwim_log()`
  refs: drop `git_default_branch_name()`
  refs: pass repo when peeling objects
  refs: move object peeling into "object.c"
  refs: pass ref store when detecting dangling symrefs
  refs: convert iteration over replace refs to accept ref store
  refs: retrieve worktree ref stores via associated repository
  refs: refactor `resolve_gitlink_ref()` to accept a repository
  refs: pass repo when retrieving submodule ref store
  refs: track ref stores via strmap
  refs: implement releasing ref storages
  refs: rename `init_db` callback to avoid confusion
  refs: adjust names for `init` and `init_db` callbacks
---

988499e2955f052fa5f58434e13d12285cb8a361
diff --cc refs.c
index 8260c27cde,43c5fef734..31032588e0
--- a/refs.c
+++ b/refs.c
@@@ -2168,30 -2056,22 +2046,30 @@@ int peel_iterated_oid(struct repositor
  	     oideq(current_ref_iter->oid, base)))
  		return ref_iterator_peel(current_ref_iter, peeled);
  
- 	return peel_object(base, peeled) ? -1 : 0;
+ 	return peel_object(r, base, peeled) ? -1 : 0;
  }
  
 -int refs_create_symref(struct ref_store *refs,
 -		       const char *ref_target,
 -		       const char *refs_heads_master,
 -		       const char *logmsg)
 +int refs_update_symref(struct ref_store *refs, const char *ref,
 +		       const char *target, const char *logmsg)
  {
 -	char *msg;
 -	int retval;
 +	struct ref_transaction *transaction;
 +	struct strbuf err = STRBUF_INIT;
 +	int ret = 0;
  
 -	msg = normalize_reflog_message(logmsg);
 -	retval = refs->be->create_symref(refs, ref_target, refs_heads_master,
 -					 msg);
 -	free(msg);
 -	return retval;
 +	transaction = ref_store_transaction_begin(refs, &err);
 +	if (!transaction ||
 +	    ref_transaction_update(transaction, ref, NULL, NULL,
 +				   target, NULL, REF_NO_DEREF,
 +				   logmsg, &err) ||
 +	    ref_transaction_commit(transaction, &err)) {
 +		ret = error("%s", err.buf);
 +	}
 +
 +	strbuf_release(&err);
 +	if (transaction)
 +		ref_transaction_free(transaction);
 +
 +	return ret;
  }
  
  int ref_update_reject_duplicates(struct string_list *refnames,