summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2014-04-07 15:48:15 +0200
committerJunio C Hamano <gitster@pobox.com>2014-04-07 12:09:15 -0700
commitcb198d21d3848f0c5f3d85a471a6a6793e540ca4 (patch)
treed84e252e441a3c9fcb4f850e4b987ea95fc321de /refs.c
parent88615910db7f700ae437318308a8631888bd28cd (diff)
downloadgit-cb198d21d3848f0c5f3d85a471a6a6793e540ca4.tar.gz
ref_transaction_commit(): simplify code using temporary variables
Use temporary variables in the for-loop blocks to simplify expressions in the rest of the loop. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs.c')
-rw-r--r--refs.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/refs.c b/refs.c
index 2ff195f471..33c34dfeff 100644
--- a/refs.c
+++ b/refs.c
@@ -3435,10 +3435,12 @@ int ref_transaction_commit(struct ref_transaction *transaction,
/* Acquire all locks while verifying old values */
for (i = 0; i < n; i++) {
- locks[i] = update_ref_lock(updates[i]->refname,
- (updates[i]->have_old ?
- updates[i]->old_sha1 : NULL),
- updates[i]->flags,
+ struct ref_update *update = updates[i];
+
+ locks[i] = update_ref_lock(update->refname,
+ (update->have_old ?
+ update->old_sha1 : NULL),
+ update->flags,
&types[i], onerr);
if (!locks[i]) {
ret = 1;
@@ -3447,16 +3449,19 @@ int ref_transaction_commit(struct ref_transaction *transaction,
}
/* Perform updates first so live commits remain referenced */
- for (i = 0; i < n; i++)
- if (!is_null_sha1(updates[i]->new_sha1)) {
+ for (i = 0; i < n; i++) {
+ struct ref_update *update = updates[i];
+
+ if (!is_null_sha1(update->new_sha1)) {
ret = update_ref_write(msg,
- updates[i]->refname,
- updates[i]->new_sha1,
+ update->refname,
+ update->new_sha1,
locks[i], onerr);
locks[i] = NULL; /* freed by update_ref_write */
if (ret)
goto cleanup;
}
+ }
/* Perform deletes now that updates are safely completed */
for (i = 0; i < n; i++)