Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
lock_ref_sha1_basic(): inline constant
author
Michael Haggerty
<mhagger@alum.mit.edu>
Fri, 6 Jan 2017 16:22:27 +0000
(17:22 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 8 Jan 2017 03:30:09 +0000
(19:30 -0800)
`lflags` is set a single time then never changed, so just inline it.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
refs/files-backend.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
177978f
)
diff --git
a/refs/files-backend.c
b/refs/files-backend.c
index be4ffdca243c7853b9863c0c19dadbf79b324aea..7d4658aa94e7251f4d29cfea00c9454541f4c3e6 100644
(file)
--- a/
refs/files-backend.c
+++ b/
refs/files-backend.c
@@
-2000,7
+2000,6
@@
static struct ref_lock *lock_ref_sha1_basic(struct files_ref_store *refs,
struct strbuf ref_file = STRBUF_INIT;
struct ref_lock *lock;
int last_errno = 0;
struct strbuf ref_file = STRBUF_INIT;
struct ref_lock *lock;
int last_errno = 0;
- int lflags = LOCK_NO_DEREF;
int mustexist = (old_sha1 && !is_null_sha1(old_sha1));
int resolve_flags = RESOLVE_REF_NO_RECURSE;
int attempts_remaining = 3;
int mustexist = (old_sha1 && !is_null_sha1(old_sha1));
int resolve_flags = RESOLVE_REF_NO_RECURSE;
int attempts_remaining = 3;
@@
-2083,7
+2082,7
@@
static struct ref_lock *lock_ref_sha1_basic(struct files_ref_store *refs,
goto error_return;
}
goto error_return;
}
- if (hold_lock_file_for_update(lock->lk, ref_file.buf,
lflags
) < 0) {
+ if (hold_lock_file_for_update(lock->lk, ref_file.buf,
LOCK_NO_DEREF
) < 0) {
last_errno = errno;
if (errno == ENOENT && --attempts_remaining > 0)
/*
last_errno = errno;
if (errno == ENOENT && --attempts_remaining > 0)
/*