[PATCH 05/10] rename ref_matches_abbrev() to ref_abbrev_matches_full_with_fetch_rules()
- From
Steffen Prohaska <prohaska@zib.de>
- Date
- Oct 28, 2007, 17:46 UTC
- Message-ID
- <11935935822846-git-send-email-prohaska@zib.de>
- In-Reply-To
- <11935935812185-git-send-email-prohaska@zib.de>
The new naming makes the order of the arguments and the rules used for matching more explicit. This will avoid confusion with ref_abbrev_matches_full_with_rev_parse_rules(), which will be introduced in a follow-up commit.
Signed-off-by: Steffen Prohaska <prohaska@zib.de> --- remote.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/remote.c b/remote.c index 687eb8e..59e6485 100644 --- a/remote.c +++ b/remote.c @@ -421,7 +421,7 @@ int remote_has_url(struct remote *remote, const char *url) * Returns true if, under the matching rules for fetching, name is the * same as the given full name. */ -static int ref_matches_abbrev(const char *name, const char *full) +static int ref_abbrev_matches_full_with_fetch_rules(const char *name, const char *full) { if (!prefixcmp(name, "refs/") || !strcmp(name, "HEAD")) return !strcmp(name, full); @@ -820,7 +820,7 @@ int branch_merge_matches(struct branch *branch, { if (!branch || i < 0 || i >= branch->merge_nr) return 0; - return ref_matches_abbrev(branch->merge[i]->src, refname); + return ref_abbrev_matches_full_with_fetch_rules(branch->merge[i]->src, refname); } static struct ref *get_expanded_map(struct ref *remote_refs, @@ -859,7 +859,7 @@ static struct ref *find_ref_by_name_abbrev(struct ref *refs, const char *name) { struct ref *ref; for (ref = refs; ref; ref = ref->next) { - if (ref_matches_abbrev(name, ref->name)) + if (ref_abbrev_matches_full_with_fetch_rules(name, ref->name)) return ref; } return NULL;
-- 1.5.3.4.439.ge8b49