remote: rename function omit_name_by_refspec

Rename the function `omit_name_by_refspec()` to
`refname_matches_negative_refspec_item()` to provide clearer intent.
The previous function name was vague and did not accurately describe its
purpose. By using `refname_matches_negative_refspec_item`, make the
function's purpose more intuitive, clarifying that it checks if a
reference name matches any negative refspec.

Rename function parameters for consistency with existing naming
conventions. Use `refname` instead of `name` to align with terminology
in `refs.h`.

Remove the redundant doc comment since the function name is now
self-explanatory.

Signed-off-by: Meet Soni <meetsoni3017@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/remote.c b/builtin/remote.c
index 315cbb88e64ad9be9dcd1d460d4b69fff0a5b35e..86cda4d054444a1980fe745d82159749467afa13 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -383,7 +383,7 @@ static int get_ref_states(const struct ref *remote_refs, struct ref_states *stat
                                states->remote->fetch.items[i].raw);
 
        for (ref = fetch_map; ref; ref = ref->next) {
-               if (omit_name_by_refspec(ref->name, &states->remote->fetch))
+               if (refname_matches_negative_refspec_item(ref->name, &states->remote->fetch))
                        string_list_append(&states->skipped, abbrev_branch(ref->name));
                else if (!ref->peer_ref || !refs_ref_exists(get_main_ref_store(the_repository), ref->peer_ref->name))
                        string_list_append(&states->new_refs, abbrev_branch(ref->name));

diff --git a/remote.c b/remote.c
index 0f6fba85625b523122e50e28a0f64b6e143cd9fb..cb70ce6f3bb6f4bd5c11a326f17acf837e101ac7 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -944,12 +944,12 @@ static int refspec_match(const struct refspec_item *refspec,
        return !strcmp(refspec->src, name);
 }
 
-int omit_name_by_refspec(const char *name, struct refspec *rs)
+int refname_matches_negative_refspec_item(const char *refname, struct refspec *rs)
 {
        int i;
 
        for (i = 0; i < rs->nr; i++) {
-               if (rs->items[i].negative && refspec_match(&rs->items[i], name))
+               if (rs->items[i].negative && refspec_match(&rs->items[i], refname))
                        return 1;
        }
        return 0;
@@ -962,7 +962,7 @@ struct ref *apply_negative_refspecs(struct ref *ref_map, struct refspec *rs)
        for (tail = &ref_map; *tail; ) {
                struct ref *ref = *tail;
 
-               if (omit_name_by_refspec(ref->name, rs)) {
+               if (refname_matches_negative_refspec_item(ref->name, rs)) {
                        *tail = ref->next;
                        free(ref->peer_ref);
                        free(ref);
@@ -1021,7 +1021,7 @@ static int query_matches_negative_refspec(struct refspec *rs, struct refspec_ite
        }
 
        for (i = 0; !matched_negative && i < reversed.nr; i++) {
-               if (omit_name_by_refspec(reversed.items[i].string, rs))
+               if (refname_matches_negative_refspec_item(reversed.items[i].string, rs))
                        matched_negative = 1;
        }
 

diff --git a/remote.h b/remote.h
index bda10dd5c85ffd8988a6c3d39583e7b9701278b8..66ee53411d76691122b642dfe162d5aa455ab5c8 100644 (file)
--- a/remote.h
+++ b/remote.h
@@ -261,11 +261,7 @@ int resolve_remote_symref(struct ref *ref, struct ref *list);
  */
 struct ref *ref_remove_duplicates(struct ref *ref_map);
 
-/*
- * Check whether a name matches any negative refspec in rs. Returns 1 if the
- * name matches at least one negative refspec, and 0 otherwise.
- */
-int omit_name_by_refspec(const char *name, struct refspec *rs);
+int refname_matches_negative_refspec_item(const char *refname, struct refspec *rs);
 
 /*
  * Remove all entries in the input list which match any negative refspec in