refs/files: remove unused "skip" in lock_raw_ref() too

Remove the unused "skip" parameter to lock_raw_ref(), it was never
used. We do use it when passing "skip" to the
refs_rename_ref_available() function in files_copy_or_rename_ref(),
but not here.

This is part of a larger series that modifies lock_ref_oid_basic()
extensively, there will be no more modifications of this function in
this series, but since the preceding commit removed this unused
parameter from lock_ref_oid_basic(), let's do it here too for
consistency.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 69f7f54e03be5c809acf12c2cff55f27caafd0f6..997e021c1c40a6cad83d3710e5c2fd8d8c75c8b4 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -531,7 +531,6 @@ static void unlock_ref(struct ref_lock *lock)
 static int lock_raw_ref(struct files_ref_store *refs,
                        const char *refname, int mustexist,
                        const struct string_list *extras,
-                       const struct string_list *skip,
                        struct ref_lock **lock_p,
                        struct strbuf *referent,
                        unsigned int *type,
@@ -568,7 +567,7 @@ retry:
                 * reason to expect this error to be transitory.
                 */
                if (refs_verify_refname_available(&refs->base, refname,
-                                                 extras, skip, err)) {
+                                                 extras, NULL, err)) {
                        if (mustexist) {
                                /*
                                 * To the user the relevant error is
@@ -673,7 +672,7 @@ retry:
                                                          REMOVE_DIR_EMPTY_ONLY)) {
                                if (refs_verify_refname_available(
                                                    &refs->base, refname,
-                                                   extras, skip, err)) {
+                                                   extras, NULL, err)) {
                                        /*
                                         * The error message set by
                                         * verify_refname_available() is OK.
@@ -710,7 +709,7 @@ retry:
                 */
                if (refs_verify_refname_available(
                                    refs->packed_ref_store, refname,
-                                   extras, skip, err))
+                                   extras, NULL, err))
                        goto error_return;
        }
 
@@ -2407,7 +2406,7 @@ static int lock_ref_for_update(struct files_ref_store *refs,
        }
 
        ret = lock_raw_ref(refs, update->refname, mustexist,
-                          affected_refnames, NULL,
+                          affected_refnames,
                           &lock, &referent,
                           &update->type, err);
        if (ret) {