mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

struct ref_lock: delete the force_write member

Browse Source 
Instead, compute the value when it is needed.

Signed-off-by: Stefan Beller <sbeller@google.com>
Edited-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller
2015-03-03 12:43:14 +01:00
committed by Junio C Hamano
parent 074336e5ed
commit 5a6f47077b
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
refs.c
View File

@ -12,7 +12,6 @@ struct ref_lock {
struct lock_file *lk; struct lock_file *lk;
unsigned char old_sha1[20]; unsigned char old_sha1[20];
int lock_fd; int lock_fd;
int force_write;
}; };
/* /*
@ -2319,8 +2318,6 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
lock->ref_name = xstrdup(refname); lock->ref_name = xstrdup(refname);
lock->orig_ref_name = xstrdup(orig_refname); lock->orig_ref_name = xstrdup(orig_refname);
ref_file = git_path("%s", refname); ref_file = git_path("%s", refname);
if ((flags & REF_NODEREF) && (type & REF_ISSYMREF))
lock->force_write = 1;
retry: retry:
switch (safe_create_leading_directories(ref_file)) { switch (safe_create_leading_directories(ref_file)) {
@ -3788,8 +3785,15 @@ int ref_transaction_commit(struct ref_transaction *transaction,
struct ref_update *update = updates[i]; struct ref_update *update = updates[i];
if (!is_null_sha1(update->new_sha1)) { if (!is_null_sha1(update->new_sha1)) {
if (!update->lock->force_write && int overwriting_symref = ((update->type & REF_ISSYMREF) &&
!hashcmp(update->lock->old_sha1, update->new_sha1)) { (update->flags & REF_NODEREF));
if (!overwriting_symref
&& !hashcmp(update->lock->old_sha1, update->new_sha1)) {
/*
* The reference already has the desired
* value, so we don't need to write it.
*/
unlock_ref(update->lock); unlock_ref(update->lock);
update->lock = NULL; update->lock = NULL;
} else if (write_ref_sha1(update->lock, update->new_sha1, } else if (write_ref_sha1(update->lock, update->new_sha1,