All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ronnie Sahlberg <sahlberg@google.com>
To: git@vger.kernel.org
Cc: mhagger@alum.mit.edu, Ronnie Sahlberg <sahlberg@google.com>
Subject: [PATCH v2 07/13] replace.c: use the ref transaction functions for updates
Date: Mon, 21 Apr 2014 15:53:25 -0700	[thread overview]
Message-ID: <1398120811-20284-8-git-send-email-sahlberg@google.com> (raw)
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

  parent reply	other threads:[~2014-04-21 22:54 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-21 22:53 [PATCH v2 00/13] Use ref transactions from most callers Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 01/13] refs.c: constify the sha arguments for ref_transaction_create|delete|update Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 02/13] refs.c: use a single exit path from transaction commit and handle onerr Ronnie Sahlberg
2014-04-22 19:11   ` Junio C Hamano
2014-04-22 22:46     ` Ronnie Sahlberg
2014-04-22 19:14   ` Junio C Hamano
2014-04-21 22:53 ` [PATCH v2 03/13] refs.c: change ref_transaction_update() to do error checking and return status Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 04/13] refs.c: change ref_transaction_create " Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 05/13] refs.c: ref_transaction_delete to check for error " Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 06/13] tag.c: use ref transactions when doing updates Ronnie Sahlberg
2014-04-21 22:53 ` Ronnie Sahlberg [this message]
2014-04-21 22:53 ` [PATCH v2 08/13] commit.c: use ref transactions for updates Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 09/13] sequencer.c: use ref transactions for all ref updates Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 10/13] fast-import.c: change update_branch to use ref transactions Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 11/13] branch.c: use ref transaction for all ref updates Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 12/13] walker.c: use ref transaction for " Ronnie Sahlberg
2014-04-21 22:53 ` [PATCH v2 13/13] refs.c: change update_ref to use a transaction Ronnie Sahlberg
2014-04-22 19:34 ` [PATCH v2 00/13] Use ref transactions from most callers Junio C Hamano
2014-04-22 22:43   ` Ronnie Sahlberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1398120811-20284-8-git-send-email-sahlberg@google.com \
    --to=sahlberg@google.com \
    --cc=git@vger.kernel.org \
    --cc=mhagger@alum.mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.