git.vger.kernel.org archive mirror
 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 2/3] fetch.c: change s_update_ref to use a ref transaction
Date: Tue, 22 Apr 2014 11:45:26 -0700	[thread overview]
Message-ID: <1398192327-21302-3-git-send-email-sahlberg@google.com> (raw)
In-Reply-To: <1398192327-21302-1-git-send-email-sahlberg@google.com>

Change s_update_ref to use a ref transaction for the ref update.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 builtin/fetch.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/builtin/fetch.c b/builtin/fetch.c
index a93c893..5c15584 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -375,7 +375,7 @@ static int s_update_ref(const char *action,
 {
 	char msg[1024];
 	char *rla = getenv("GIT_REFLOG_ACTION");
-	static struct ref_lock *lock;
+	struct ref_transaction *transaction;
 
 	if (dry_run)
 		return 0;
@@ -384,15 +384,14 @@ static int s_update_ref(const char *action,
 	snprintf(msg, sizeof(msg), "%s: %s", rla, action);
 
 	errno = 0;
-	lock = lock_any_ref_for_update(ref->name,
-				       check_old ? ref->old_sha1 : NULL,
-				       0, NULL);
-	if (!lock)
-		return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
-					  STORE_REF_ERROR_OTHER;
-	if (write_ref_sha1(lock, ref->new_sha1, msg) < 0)
+	transaction = ref_transaction_begin();
+	if (!transaction ||
+	    ref_transaction_update(transaction, ref->name, ref->new_sha1,
+				   ref->old_sha1, 0, check_old) ||
+	    ref_transaction_commit(transaction, msg, UPDATE_REFS_QUIET_ON_ERR))
 		return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT :
 					  STORE_REF_ERROR_OTHER;
+
 	return 0;
 }
 
-- 
1.9.1.518.g16976cb.dirty

  parent reply	other threads:[~2014-04-22 18:46 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-22 18:45 [PATCH 0/3] Use ref transactions for fetch Ronnie Sahlberg
2014-04-22 18:45 ` [PATCH 1/3] fetch.c: clear errno before calling functions that might set it Ronnie Sahlberg
2014-04-23 20:12   ` Eric Sunshine
2014-04-24 15:21     ` Ronnie Sahlberg
2014-04-22 18:45 ` Ronnie Sahlberg [this message]
2014-04-23 20:12   ` [PATCH 2/3] fetch.c: change s_update_ref to use a ref transaction Eric Sunshine
2014-04-24 15:22     ` Ronnie Sahlberg
2014-04-22 18:45 ` [PATCH 3/3] fetch.c: use a single ref transaction for all ref updates Ronnie Sahlberg
2014-04-23 20:17   ` Eric Sunshine
2014-04-24 15:23     ` Ronnie Sahlberg
2014-05-05 11:22 ` [PATCH 0/3] Use ref transactions for fetch Michael Haggerty
2014-05-05 15:08   ` Ronnie Sahlberg
2014-05-06 18:40   ` Junio C Hamano
2014-05-06 20:53     ` Michael Haggerty

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=1398192327-21302-3-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).