From: Meet Soni <meetsoni3017@gmail.com>
To: git@vger.kernel.org
Cc: shubham.kanodia10@gmail.com, Meet Soni <meetsoni3017@gmail.com>,
Jeff King <peff@peff.net>,
Jacob Keller <jacob.e.keller@intel.com>,
Junio C Hamano <gitster@pobox.com>,
Jacob Keller <jacob.keller@gmail.com>,
Matthew Rogers <mattr94@gmail.com>,
Patrick Steinhardt <ps@pks.im>,
Pavel Rappo <pavel.rappo@gmail.com>
Subject: [PATCH v3 1/5] refactor(remote): rename function omit_name_by_refspec
Date: Sat, 1 Feb 2025 12:11:58 +0530 [thread overview]
Message-ID: <20250201064202.76116-2-meetsoni3017@gmail.com> (raw)
In-Reply-To: <20250201064202.76116-1-meetsoni3017@gmail.com>
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>
---
builtin/remote.c | 2 +-
remote.c | 8 ++++----
remote.h | 6 +-----
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/builtin/remote.c b/builtin/remote.c
index 0435963286..258b8895cd 100644
--- 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 0f6fba8562..cb70ce6f3b 100644
--- 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 bda10dd5c8..66ee53411d 100644
--- 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
--
2.34.1
next prev parent reply other threads:[~2025-02-01 6:42 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-27 10:36 [PATCH v2 0/3] refspec: centralize refspec-related logic Meet Soni
2025-01-27 10:36 ` [PATCH v2 1/3] refspec: relocate omit_name_by_refspec and related functions Meet Soni
2025-01-27 17:21 ` Junio C Hamano
2025-01-29 5:15 ` Meet Soni
2025-01-27 10:36 ` [PATCH v2 2/3] refspec: relocate query " Meet Soni
2025-01-27 19:25 ` Junio C Hamano
2025-01-29 6:32 ` Meet Soni
2025-01-27 10:36 ` [PATCH v2 3/3] refspec: relocate apply_refspecs and related funtions Meet Soni
2025-01-27 20:14 ` Junio C Hamano
2025-01-29 7:03 ` Meet Soni
2025-01-27 11:00 ` [PATCH v2 0/3] refspec: centralize refspec-related logic Meet Soni
2025-01-27 18:10 ` Junio C Hamano
2025-01-29 5:18 ` Meet Soni
2025-02-01 6:41 ` [PATCH v3 0/5] " Meet Soni
2025-02-01 6:41 ` Meet Soni [this message]
2025-02-03 6:45 ` [PATCH v3 1/5] refactor(remote): rename function omit_name_by_refspec Patrick Steinhardt
2025-02-01 6:41 ` [PATCH v3 2/5] refspec: relocate refname_matches_negative_refspec_item Meet Soni
2025-02-01 6:42 ` [PATCH v3 3/5] refactor(remote): rename query_refspecs functions Meet Soni
2025-02-03 6:46 ` Patrick Steinhardt
2025-02-04 3:39 ` Meet Soni
2025-02-04 13:58 ` Junio C Hamano
2025-02-01 6:42 ` [PATCH v3 4/5] refspec: relocate matching related functions Meet Soni
2025-02-01 6:42 ` [PATCH v3 5/5] refspec: relocate apply_refspecs and related funtions Meet Soni
2025-02-04 4:05 ` [GSoC][PATCH v4 0/5] refspec: centralize refspec-related logic Meet Soni
2025-02-04 4:05 ` [GSoC][PATCH v4 1/5] remote: rename function omit_name_by_refspec Meet Soni
2025-02-04 9:00 ` Karthik Nayak
2025-02-04 13:58 ` Meet Soni
2025-02-06 10:13 ` Karthik Nayak
2025-02-04 4:05 ` [GSoC][PATCH v4 2/5] refspec: relocate refname_matches_negative_refspec_item Meet Soni
2025-02-04 4:05 ` [GSoC][PATCH v4 3/5] remote: rename query_refspecs functions Meet Soni
2025-02-04 4:05 ` [GSoC][PATCH v4 4/5] refspec: relocate matching related functions Meet Soni
2025-02-04 4:05 ` [GSoC][PATCH v4 5/5] refspec: relocate apply_refspecs and related funtions Meet Soni
2025-02-04 7:16 ` [GSoC][PATCH v4 0/5] refspec: centralize refspec-related logic Patrick Steinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250201064202.76116-2-meetsoni3017@gmail.com \
--to=meetsoni3017@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.e.keller@intel.com \
--cc=jacob.keller@gmail.com \
--cc=mattr94@gmail.com \
--cc=pavel.rappo@gmail.com \
--cc=peff@peff.net \
--cc=ps@pks.im \
--cc=shubham.kanodia10@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).