[PATCH 09/25] refs.c: call lock_ref_sha1_basic directly from commit
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Oct 15, 2014, 00:49 UTC
- Message-ID
- <20141015004927.GM32245@google.com>
- In-Reply-To
- <20141015004522.GD32245@google.com>
From: Ronnie Sahlberg <sahlberg@google.com> Date: Thu, 1 May 2014 10:43:39 -0700
Skip using the lock_any_ref_for_update wrapper and call lock_ref_sha1_basic directly from the commit function.
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com> Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- refs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/refs.c b/refs.c index 9c01623..b591b9c 100644 --- a/refs.c +++ b/refs.c @@ -3632,12 +3632,12 @@ int ref_transaction_commit(struct ref_transaction *transaction, for (i = 0; i < n; i++) { struct ref_update *update = updates[i]; - update->lock = lock_any_ref_for_update(update->refname, - (update->have_old ? - update->old_sha1 : - NULL), - update->flags, - &update->type); + update->lock = lock_ref_sha1_basic(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'.",
-- 2.1.0.rc2.206.gedb03e5