Sync with master

diff --git a/remote-curl.c b/remote-curl.c
index 431839111a9594174c6648d883f43eea9de89128..e11e619d0da8a3b0748ca1af7d58bce07aaf7431 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -24,6 +24,7 @@ struct options {
        char *deepen_since;
        struct string_list deepen_not;
        struct string_list push_options;
+       char *filter;
        unsigned progress : 1,
                check_self_contained_and_connected : 1,
                cloning : 1,
@@ -165,6 +166,9 @@ static int set_option(const char *name, const char *value)
        } else if (!strcmp(name, "no-dependents")) {
                options.no_dependents = 1;
                return 0;
+       } else if (!strcmp(name, "filter")) {
+               options.filter = xstrdup(value);;
+               return 0;
        } else {
                return 1 /* unsupported */;
        }
@@ -347,6 +351,8 @@ static struct discovery *discover_refs(const char *service, int for_push)
                 * pkt-line matches our request.
                 */
                line = packet_read_line_buf(&last->buf, &last->len, NULL);
+               if (!line)
+                       die("invalid server response; expected service, got flush packet");
 
                strbuf_reset(&exp);
                strbuf_addf(&exp, "# service=%s", service);
@@ -834,6 +840,8 @@ static int fetch_git(struct discovery *heads,
                argv_array_push(&args, "--from-promisor");
        if (options.no_dependents)
                argv_array_push(&args, "--no-dependents");
+       if (options.filter)
+               argv_array_pushf(&args, "--filter=%s", options.filter);
        argv_array_push(&args, url.buf);
 
        for (i = 0; i < nr_heads; i++) {