mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent ac355298b1 54457fe509
commit 9bb5287098
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
remote.c
View File

@ -1000,7 +1000,7 @@ int count_refspec_match(const char *pattern,
char *name = refs->name;
int namelen = strlen(name);
if (!refname_match(pattern, name, ref_rev_parse_rules))
if (!refname_match(pattern, name))
continue;
/* A match is "weak" if it is with refs outside
@ -1571,7 +1571,7 @@ int branch_merge_matches(struct branch *branch,
{
if (!branch || i < 0 || i >= branch->merge_nr)
return 0;
return refname_match(branch->merge[i]->src, refname, ref_fetch_rules);
return refname_match(branch->merge[i]->src, refname);
}
static int ignore_symref_update(const char *refname)
@ -1624,7 +1624,7 @@ static const struct ref *find_ref_by_name_abbrev(const struct ref *refs, const c
{
const struct ref *ref;
for (ref = refs; ref; ref = ref->next) {
if (refname_match(name, ref->name, ref_fetch_rules))
if (refname_match(name, ref->name))
return ref;
}
return NULL;
@ -2121,7 +2121,7 @@ static void apply_cas(struct push_cas_option *cas,
/* Find an explicit --<option>=<name>[:<value>] entry */
for (i = 0; i < cas->nr; i++) {
struct push_cas *entry = &cas->entry[i];
if (!refname_match(entry->refname, ref->name, ref_rev_parse_rules))
if (!refname_match(entry->refname, ref->name))
continue;
ref->expect_old_sha1 = 1;
if (!entry->use_tracking)