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

[PATCH v2 07/13] replace.c: use the ref transaction functions for updates

From
Ronnie Sahlberg <sahlberg@google.com>
Date
Apr 21, 2014, 22:53 UTC
Message-ID
<1398120811-20284-8-git-send-email-sahlberg@google.com>
In-Reply-To
<1398120811-20284-1-git-send-email-sahlberg@google.com>
Update replace.c to use ref transactions for updates.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 builtin/replace.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/builtin/replace.c b/builtin/replace.c
index b62420a..b91e550 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -129,7 +129,7 @@ static int replace_object(const char *object_ref, const char *replace_ref,
 	unsigned char object[20], prev[20], repl[20];
 	enum object_type obj_type, repl_type;
 	char ref[PATH_MAX];
-	struct ref_lock *lock;
+	struct ref_transaction *transaction;
 
 	if (get_sha1(object_ref, object))
 		die("Failed to resolve '%s' as a valid ref.", object_ref);
@@ -157,11 +157,12 @@ static int replace_object(const char *object_ref, const char *replace_ref,
 	else if (!force)
 		die("replace ref '%s' already exists", ref);
 
-	lock = lock_any_ref_for_update(ref, prev, 0, NULL);
-	if (!lock)
-		die("%s: cannot lock the ref", ref);
-	if (write_ref_sha1(lock, repl, NULL) < 0)
-		die("%s: cannot update the ref", ref);
+	transaction = ref_transaction_begin();
+	if (!transaction ||
+	    ref_transaction_update(transaction, ref, repl, prev,
+				   0, !is_null_sha1(prev)) ||
+	    ref_transaction_commit(transaction, NULL, UPDATE_REFS_DIE_ON_ERR))
+		die(_("%s: failed to replace ref"), ref);
 
 	return 0;
 }

-- 
1.9.1.515.g3b87021
Previous: Ronnie SahlbergNext: Ronnie Sahlberg
Message 11 of 19 in “Use ref transactions from most callers”
  1. 00/13 Use ref transactions from most callersRonnie Sahlberg, Apr 21, 2014
  2. 01/13 refs.c: constify the sha arguments for ref_transaction_create|delete|updateRonnie Sahlberg, Apr 21, 2014
  3. 02/13 refs.c: use a single exit path from transaction commit and handle onerrRonnie Sahlberg, Apr 21, 2014
  4. Junio C HamanoApr 22, 2014
  5. Ronnie SahlbergApr 22, 2014
  6. Junio C HamanoApr 22, 2014
  7. 03/13 refs.c: change ref_transaction_update() to do error checking and return statusRonnie Sahlberg, Apr 21, 2014
  8. 04/13 refs.c: change ref_transaction_create to do error checking and return statusRonnie Sahlberg, Apr 21, 2014
  9. 05/13 refs.c: ref_transaction_delete to check for error and return statusRonnie Sahlberg, Apr 21, 2014
  10. 06/13 tag.c: use ref transactions when doing updatesRonnie Sahlberg, Apr 21, 2014
  11. 07/13 replace.c: use the ref transaction functions for updatesRonnie Sahlberg, Apr 21, 2014
  12. 08/13 commit.c: use ref transactions for updatesRonnie Sahlberg, Apr 21, 2014
  13. 09/13 sequencer.c: use ref transactions for all ref updatesRonnie Sahlberg, Apr 21, 2014
  14. 10/13 fast-import.c: change update_branch to use ref transactionsRonnie Sahlberg, Apr 21, 2014
  15. 11/13 branch.c: use ref transaction for all ref updatesRonnie Sahlberg, Apr 21, 2014
  16. 12/13 walker.c: use ref transaction for ref updatesRonnie Sahlberg, Apr 21, 2014
  17. 13/13 refs.c: change update_ref to use a transactionRonnie Sahlberg, Apr 21, 2014
  18. Junio C HamanoApr 22, 2014
  19. Ronnie SahlbergApr 22, 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.