undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keep '*' in pattern refspecs

Browse Source 
In order to do anything more capable with refspecs, the first step is
to keep the entire input. Additionally, validate patterns by checking
for the ref matching the rules for a pattern as given by
check_ref_format(). This requires a slight change to
check_ref_format() to make it enforce the requirement that the '*'
immediately follow a '/'.

Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Daniel Barkalow 2009-03-07 01:11:36 -05:00 committed by Junio C Hamano
parent e928213fb4
commit 08fbdb3043
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
refs.c
View File

@ -718,9 +718,7 @@ int check_ref_format(const char *ref)
while ((ch = *cp++) != 0) {
bad_type = bad_ref_char(ch);
if (bad_type) {
return (bad_type == 2 && !*cp)
? CHECK_REF_FORMAT_WILDCARD
: CHECK_REF_FORMAT_ERROR;
return CHECK_REF_FORMAT_ERROR;
}
if (ch == '/')
break;

33
remote.c
View File

@ -10,8 +10,8 @@ static struct refspec s_tag_refspec = {
0,
1,
0,
"refs/tags/",
"refs/tags/"
"refs/tags/*",
"refs/tags/*"
};
const struct refspec *tag_refspec = &s_tag_refspec;
@ -451,16 +451,11 @@ static void read_config(void)
*/
static int verify_refname(char *name, int is_glob)
{
int result, len = -1;
int result;
if (is_glob) {
len = strlen(name);
assert(name[len - 1] == '/');
name[len - 1] = '\0';
}
result = check_ref_format(name);
if (is_glob)
name[len - 1] = '/';
if (is_glob && result == CHECK_REF_FORMAT_WILDCARD)
result = CHECK_REF_FORMAT_OK;
return result;
}
@ -517,7 +512,7 @@ static struct refspec *parse_refspec_internal(int nr_refspec, const char **refsp
if (rhs) {
size_t rlen = strlen(++rhs);
is_glob = (2 <= rlen && !strcmp(rhs + rlen - 2, "/*"));
rs[i].dst = xstrndup(rhs, rlen - is_glob);
rs[i].dst = xstrndup(rhs, rlen);
}
llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
@ -525,7 +520,6 @@ static struct refspec *parse_refspec_internal(int nr_refspec, const char **refsp
if ((rhs && !is_glob) || (!rhs && fetch))
goto invalid;
is_glob = 1;
llen--;
} else if (rhs && is_glob) {
goto invalid;
}
@ -722,10 +716,19 @@ int remote_has_url(struct remote *remote, const char *url)
static int match_name_with_pattern(const char *key, const char *name,
const char *value, char **result)
{
size_t klen = strlen(key);
int ret = !strncmp(key, name, klen);
const char *kstar = strchr(key, '*');
size_t klen;
int ret;
if (!kstar)
die("Key '%s' of pattern had no '*'", key);
klen = kstar - key;
ret = !strncmp(key, name, klen);
if (ret && value) {
size_t vlen = strlen(value);
const char *vstar = strchr(value, '*');
size_t vlen;
if (!vstar)
die("Value '%s' of pattern has no '*'", value);
vlen = vstar - value;
*result = xmalloc(vlen +
strlen(name) -
klen + 1);