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

refs: drop unused "flags" parameter to lock_ref_oid_basic()

Browse Source 
In the last commit we removed the REF_DELETING flag from
lock_ref_oid_basic(). Since then all of the remaining callers do pass
REF_NO_DEREF, but that has been ignored completely since
7a418f3a17 (lock_ref_sha1_basic(): only handle REF_NODEREF mode,
2016-04-22).

So we can simply get rid of the parameter entirely.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2021-08-23 13:36:04 +02:00
committed by Junio C Hamano
parent 212631ed50
commit 491ad946b2
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
refs/files-backend.c
View File

@ -917,8 +917,7 @@ static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs,
const struct object_id *old_oid, const struct object_id *old_oid,
const struct string_list *extras, const struct string_list *extras,
const struct string_list *skip, const struct string_list *skip,
unsigned int flags, int *type, int *type, struct strbuf *err)
struct strbuf *err)
{ {
struct strbuf ref_file = STRBUF_INIT; struct strbuf ref_file = STRBUF_INIT;
struct ref_lock *lock; struct ref_lock *lock;
@ -1413,8 +1412,9 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
logmoved = log; logmoved = log;
lock = lock_ref_oid_basic(refs, newrefname, NULL, NULL, NULL, lock = lock_ref_oid_basic(refs, newrefname, NULL, NULL, NULL,
REF_NO_DEREF, NULL, &err); NULL, &err);
if (!lock) { if (!lock) {
if (copy) if (copy)
error("unable to copy '%s' to '%s': %s", oldrefname, newrefname, err.buf); error("unable to copy '%s' to '%s': %s", oldrefname, newrefname, err.buf);
@ -1437,7 +1437,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
rollback: rollback:
lock = lock_ref_oid_basic(refs, oldrefname, NULL, NULL, NULL, lock = lock_ref_oid_basic(refs, oldrefname, NULL, NULL, NULL,
REF_NO_DEREF, NULL, &err); NULL, &err);
if (!lock) { if (!lock) {
error("unable to lock %s for rollback: %s", oldrefname, err.buf); error("unable to lock %s for rollback: %s", oldrefname, err.buf);
strbuf_release(&err); strbuf_release(&err);
@ -1845,7 +1845,7 @@ static int files_create_symref(struct ref_store *ref_store,
int ret; int ret;
lock = lock_ref_oid_basic(refs, refname, NULL, lock = lock_ref_oid_basic(refs, refname, NULL,
NULL, NULL, REF_NO_DEREF, NULL, NULL, NULL, NULL,
&err); &err);
if (!lock) { if (!lock) {
error("%s", err.buf); error("%s", err.buf);
@ -3064,8 +3064,7 @@ static int files_reflog_expire(struct ref_store *ref_store,
* reference if --updateref was specified: * reference if --updateref was specified:
*/ */
lock = lock_ref_oid_basic(refs, refname, oid, lock = lock_ref_oid_basic(refs, refname, oid,
NULL, NULL, REF_NO_DEREF, NULL, NULL, &type, &err);
&type, &err);
if (!lock) { if (!lock) {
error("cannot lock ref '%s': %s", refname, err.buf); error("cannot lock ref '%s': %s", refname, err.buf);
strbuf_release(&err); strbuf_release(&err);