summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorRonnie Sahlberg <sahlberg@google.com>2014-05-01 17:43:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-15 17:47:23 (GMT)
commit5d94a1b03318d14847a40f233560c2a87fb16cfa (patch)
treec863ea001877861617786b02b2e00500ccac2125 /refs.c
parent8a9df90d9a726fa9b1a1ebd13b9e43409e18c606 (diff)
downloadgit-5d94a1b03318d14847a40f233560c2a87fb16cfa.zip
git-5d94a1b03318d14847a40f233560c2a87fb16cfa.tar.gz
git-5d94a1b03318d14847a40f233560c2a87fb16cfa.tar.bz2
refs.c: call lock_ref_sha1_basic directly from commit
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs.c')
-rw-r--r--refs.c12
1 files 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'.",