git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v5 29/30] refs.c: remove the update_ref_lock function

From
Ronnie Sahlberg <sahlberg@google.com>
Date
Apr 29, 2014, 22:19 UTC
Message-ID
<1398809955-32008-30-git-send-email-sahlberg@google.com>
In-Reply-To
<1398809955-32008-1-git-send-email-sahlberg@google.com>

Since we now only call update_ref_lock with onerr==QUIET_ON_ERR we no longer need this function and can replace it with just calling lock_any_ref_for_update directly.

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 refs.c | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)
diff --git a/refs.c b/refs.c
index 206e1a2..9f5435d 100644
--- a/refs.c
+++ b/refs.c
@@ -3235,24 +3235,6 @@ int for_each_reflog(each_ref_fn fn, void *cb_data)
 	return retval;
 }
 
-static struct ref_lock *update_ref_lock(const char *refname,
-					const unsigned char *oldval,
-					int flags, int *type_p,
-					enum action_on_err onerr)
-{
-	struct ref_lock *lock;
-	lock = lock_any_ref_for_update(refname, oldval, flags, type_p);
-	if (!lock) {
-		const char *str = "Cannot lock the ref '%s'.";
-		switch (onerr) {
-		case UPDATE_REFS_MSG_ON_ERR: error(str, refname); break;
-		case UPDATE_REFS_DIE_ON_ERR: die(str, refname); break;
-		case UPDATE_REFS_QUIET_ON_ERR: break;
-		}
-	}
-	return lock;
-}
-
 static int update_ref_write(const char *action, const char *refname,
 			    const unsigned char *sha1, struct ref_lock *lock,
 			    struct strbuf *err, enum action_on_err onerr)
@@ -3496,12 +3478,12 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 	for (i = 0; i < n; i++) {
 		struct ref_update *update = updates[i];
 
-		update->lock = update_ref_lock(update->refname,
-					       (update->have_old ?
-						update->old_sha1 : NULL),
-					       update->flags,
-					       &update->type,
-					       UPDATE_REFS_QUIET_ON_ERR);
+		update->lock = lock_any_ref_for_update(update->refname,
+						       (update->have_old ?
+							update->old_sha1 :
+							NULL),
+						       update->flags,
+						       &update->type);
 		if (!update->lock) {
 			if (err)
 				strbuf_addf(err ,"Cannot lock the ref '%s'.",

-- 
1.9.1.532.gf8485a6
Previous: Ronnie SahlbergNext: Ronnie Sahlberg
Message 30 of 31 in “Use ref transactions for all ref updates”
  1. 00/30 Use ref transactions for all ref updatesRonnie Sahlberg, Apr 29, 2014
  2. 01/30 refs.c: constify the sha arguments for ref_transaction_create|delete|updateRonnie Sahlberg, Apr 29, 2014
  3. 02/30 refs.c: allow passing NULL to ref_transaction_freeRonnie Sahlberg, Apr 29, 2014
  4. 03/30 refs.c: add a strbuf argument to ref_transaction_commit for error loggingRonnie Sahlberg, Apr 29, 2014
  5. 04/30 refs.c: make ref_update_reject_duplicates take a strbuf argument for errorsRonnie Sahlberg, Apr 29, 2014
  6. 05/30 update-ref.c: log transaction error from the update_refRonnie Sahlberg, Apr 29, 2014
  7. 06/30 refs.c: make update_ref_write update a strbuf on failureRonnie Sahlberg, Apr 29, 2014
  8. 07/30 refs.c: remove the onerr argument to ref_transaction_commitRonnie Sahlberg, Apr 29, 2014
  9. 08/30 refs.c: change ref_transaction_update() to do error checking and return statusRonnie Sahlberg, Apr 29, 2014
  10. 09/30 refs.c: change ref_transaction_create to do error checking and return statusRonnie Sahlberg, Apr 29, 2014
  11. 10/30 refs.c: ref_transaction_delete to check for error and return statusRonnie Sahlberg, Apr 29, 2014
  12. 11/30 tag.c: use ref transactions when doing updatesRonnie Sahlberg, Apr 29, 2014
  13. 12/30 replace.c: use the ref transaction functions for updatesRonnie Sahlberg, Apr 29, 2014
  14. 13/30 commit.c: use ref transactions for updatesRonnie Sahlberg, Apr 29, 2014
  15. 14/30 sequencer.c: use ref transactions for all ref updatesRonnie Sahlberg, Apr 29, 2014
  16. 15/30 fast-import.c: change update_branch to use ref transactionsRonnie Sahlberg, Apr 29, 2014
  17. 16/30 branch.c: use ref transaction for all ref updatesRonnie Sahlberg, Apr 29, 2014
  18. 17/30 refs.c: change update_ref to use a transactionRonnie Sahlberg, Apr 29, 2014
  19. 18/30 refs.c: free the transaction before returning when number of updates is 0Ronnie Sahlberg, Apr 29, 2014
  20. 19/30 refs.c: ref_transaction_commit should not free the transactionRonnie Sahlberg, Apr 29, 2014
  21. 20/30 fetch.c: clear errno before calling functions that might set itRonnie Sahlberg, Apr 29, 2014
  22. 21/30 fetch.c: change s_update_ref to use a ref transactionRonnie Sahlberg, Apr 29, 2014
  23. 22/30 fetch.c: use a single ref transaction for all ref updatesRonnie Sahlberg, Apr 29, 2014
  24. 23/30 receive-pack.c: use a reference transaction for updating the refsRonnie Sahlberg, Apr 29, 2014
  25. 24/30 fast-import.c: use a ref transaction when dumping tagsRonnie Sahlberg, Apr 29, 2014
  26. 25/30 walker.c: use ref transaction for ref updatesRonnie Sahlberg, Apr 29, 2014
  27. 26/30 refs.c: make write_ref_sha1 staticRonnie Sahlberg, Apr 29, 2014
  28. 27/30 refs.c: make lock_ref_sha1 staticRonnie Sahlberg, Apr 29, 2014
  29. 28/30 refs.c: add transaction.status and track OPEN/CLOSED/ERRORRonnie Sahlberg, Apr 29, 2014
  30. 29/30 refs.c: remove the update_ref_lock functionRonnie Sahlberg, Apr 29, 2014
  31. 30/30 refs.c: remove the update_ref_write functionRonnie Sahlberg, Apr 29, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.