Skip to content

Commit

Permalink
ref_transaction_commit(): remove the local flags variable
Browse files Browse the repository at this point in the history
Instead, work directly with update->flags. This has the advantage that
the REF_DELETING bit, set in the first loop, can be read in the second
loop instead of having to be recomputed. Plus, it was potentially
confusing having both update->flags and flags, which sometimes had
different values.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Michael Haggerty authored and Junio C Hamano committed May 13, 2015
1 parent 4da50de commit 805cf6e
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions refs.c
Original file line number Diff line number Diff line change
Expand Up @@ -3802,16 +3802,15 @@ int ref_transaction_commit(struct ref_transaction *transaction,
/* Acquire all locks while verifying old values */
for (i = 0; i < n; i++) {
struct ref_update *update = updates[i];
int flags = update->flags;

if (is_null_sha1(update->new_sha1))
flags |= REF_DELETING;
update->flags |= REF_DELETING;
update->lock = lock_ref_sha1_basic(update->refname,
(update->have_old ?
update->old_sha1 :
NULL),
NULL,
flags,
update->flags,
&update->type);
if (!update->lock) {
ret = (errno == ENOTDIR)
Expand All @@ -3827,7 +3826,7 @@ int ref_transaction_commit(struct ref_transaction *transaction,
for (i = 0; i < n; i++) {
struct ref_update *update = updates[i];

if (!is_null_sha1(update->new_sha1)) {
if (!(update->flags & REF_DELETING)) {
if (!update->lock->force_write &&
!hashcmp(update->lock->old_sha1, update->new_sha1)) {
unlock_ref(update->lock);
Expand Down

0 comments on commit 805cf6e

Please sign in to comment.