Merge branch 'mh/retire-ref-fetch-rules'

Code simplification.

* mh/retire-ref-fetch-rules:
  refname_match(): always use the rules in ref_rev_parse_rules
This commit is contained in:
Junio C Hamano
2014-01-27 10:44:06 -08:00
3 changed files with 13 additions and 10 deletions

6
refs.c
View File

@ -1880,7 +1880,7 @@ const char *prettify_refname(const char *name)
0);
}
const char *ref_rev_parse_rules[] = {
static const char *ref_rev_parse_rules[] = {
"%.*s",
"refs/%.*s",
"refs/tags/%.*s",
@ -1890,12 +1890,12 @@ const char *ref_rev_parse_rules[] = {
NULL
};
int refname_match(const char *abbrev_name, const char *full_name, const char **rules)
int refname_match(const char *abbrev_name, const char *full_name)
{
const char **p;
const int abbrev_name_len = strlen(abbrev_name);
for (p = rules; *p; p++) {
for (p = ref_rev_parse_rules; *p; p++) {
if (!strcmp(full_name, mkpath(*p, abbrev_name_len, abbrev_name))) {
return 1;
}