@matheusbsbs / matheus-bagliano / commits / 2ea7fe0d2c
Fork 0

ls-remote: resurrect pattern limit support

"git ls-remote $remote $name1 $name2..." used to limit the output to refs that end with one of the $name given from the command line, but recent rewrite to C forgot to implement that support. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Dec 8, 2007 at 22:52 UTC 2ea7fe0d2c15a88e7e3131ad5e7e83c7320d8d0c
1 file changed +38 -6
builtin-ls-remote.c
+38 -6
@@ -6,6 +6,35 @@
6 static const char ls_remote_usage[] =
7 "git-ls-remote [--upload-pack=<git-upload-pack>] [<host>:]<directory>";
8
9 +/*
10 + * pattern is a list of tail-part of accepted refnames. Is there one
11 + * among them that is a suffix of the path? Directory boundary must
12 + * be honored when checking this match. IOW, patterns "master" and
13 + * "sa/master" both match path "refs/hold/sa/master". On the other
14 + * hand, path "refs/hold/foosa/master" is matched by "master" but not
15 + * by "sa/master".
16 + */
17 +
18 +static int tail_match(const char **pattern, const char *path)
19 +{
20 + int pathlen;
21 + const char *p;
22 +
23 + if (!*pattern)
24 + return 1; /* no restriction */
25 +
26 + for (pathlen = strlen(path); (p = *pattern); pattern++) {
27 + int pfxlen = pathlen - strlen(p);
28 + if (pfxlen < 0)
29 + continue; /* pattern is longer, will never match */
30 + if (strcmp(path + pfxlen, p))
31 + continue; /* no tail match */
32 + if (!pfxlen || path[pfxlen - 1] == '/')
33 + return 1; /* fully match at directory boundary */
34 + }
35 + return 0;
36 +}
37 +
38 int cmd_ls_remote(int argc, const char **argv, const char *prefix)
39 {
40 int i;
@@ -13,6 +42,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
42 int nongit = 0;
43 unsigned flags = 0;
44 const char *uploadpack = NULL;
45 + const char **pattern = NULL;
46
47 struct remote *remote;
48 struct transport *transport;
@@ -50,9 +80,9 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
80 break;
81 }
82
53 - if (!dest || i != argc - 1)
83 + if (!dest)
84 usage(ls_remote_usage);
55 -
85 + pattern = argv + i + 1;
86 remote = nongit ? NULL : remote_get(dest);
87 if (remote && !remote->url_nr)
88 die("remote %s has no configured URL", dest);
@@ -65,10 +95,12 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
95 if (!ref)
96 return 1;
97
68 - while (ref) {
69 - if (check_ref_type(ref, flags))
70 - printf("%s %s\n", sha1_to_hex(ref->old_sha1), ref->name);
71 - ref = ref->next;
98 + for ( ; ref; ref = ref->next) {
99 + if (!check_ref_type(ref, flags))
100 + continue;
101 + if (!tail_match(pattern, ref->name))
102 + continue;
103 + printf("%s %s\n", sha1_to_hex(ref->old_sha1), ref->name);
104 }
105 return 0;
106 }