Re-fix ls-remote
An earlier attempt in 2ea7fe0
(ls-remote: resurrect pattern limit support) forgot
that the user string can also be a glob. This should finally fix it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
cc3530e8f3
commit
3d3c4f5d76
@ -7,30 +7,22 @@ static const char ls_remote_usage[] =
|
||||
"git-ls-remote [--upload-pack=<git-upload-pack>] [<host>:]<directory>";
|
||||
|
||||
/*
|
||||
* pattern is a list of tail-part of accepted refnames. Is there one
|
||||
* among them that is a suffix of the path? Directory boundary must
|
||||
* be honored when checking this match. IOW, patterns "master" and
|
||||
* "sa/master" both match path "refs/hold/sa/master". On the other
|
||||
* hand, path "refs/hold/foosa/master" is matched by "master" but not
|
||||
* by "sa/master".
|
||||
* Is there one among the list of patterns that match the tail part
|
||||
* of the path?
|
||||
*/
|
||||
|
||||
static int tail_match(const char **pattern, const char *path)
|
||||
{
|
||||
int pathlen;
|
||||
const char *p;
|
||||
char pathbuf[PATH_MAX];
|
||||
|
||||
if (!*pattern)
|
||||
if (!pattern)
|
||||
return 1; /* no restriction */
|
||||
|
||||
for (pathlen = strlen(path); (p = *pattern); pattern++) {
|
||||
int pfxlen = pathlen - strlen(p);
|
||||
if (pfxlen < 0)
|
||||
continue; /* pattern is longer, will never match */
|
||||
if (strcmp(path + pfxlen, p))
|
||||
continue; /* no tail match */
|
||||
if (!pfxlen || path[pfxlen - 1] == '/')
|
||||
return 1; /* fully match at directory boundary */
|
||||
if (snprintf(pathbuf, sizeof(pathbuf), "/%s", path) > sizeof(pathbuf))
|
||||
return error("insanely long ref %.*s...", 20, path);
|
||||
while ((p = *(pattern++)) != NULL) {
|
||||
if (!fnmatch(p, pathbuf, 0))
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -77,12 +69,23 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
|
||||
usage(ls_remote_usage);
|
||||
}
|
||||
dest = arg;
|
||||
i++;
|
||||
break;
|
||||
}
|
||||
|
||||
if (!dest)
|
||||
usage(ls_remote_usage);
|
||||
pattern = argv + i + 1;
|
||||
|
||||
if (argv[i]) {
|
||||
int j;
|
||||
pattern = xcalloc(sizeof(const char *), argc - i + 1);
|
||||
for (j = i; j < argc; j++) {
|
||||
int len = strlen(argv[j]);
|
||||
char *p = xmalloc(len + 3);
|
||||
sprintf(p, "*/%s", argv[j]);
|
||||
pattern[j - i] = p;
|
||||
}
|
||||
}
|
||||
remote = nongit ? NULL : remote_get(dest);
|
||||
if (remote && !remote->url_nr)
|
||||
die("remote %s has no configured URL", dest);
|
||||
|
Loading…
Reference in New Issue
Block a user