upload-pack: move allow_unadvertised_object_request to upload_pack_data

As we cleanup 'upload-pack.c' by using 'struct upload_pack_data'
more thoroughly, let's move the 'allow_unadvertised_object_request'
static variable into this struct.

It is used by code common to protocol v0 and protocol v2.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/upload-pack.c b/upload-pack.c
index acddfe28d69d4e90f8403260817abac3e9643016..5cd1342f6221059caf26e33e8e1c0c961f05492c 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -44,13 +44,13 @@
 
 static timestamp_t oldest_have;
 
+/* Values for allow_unadvertised_object_request flags */
 /* Allow specifying sha1 if it is a ref tip. */
 #define ALLOW_TIP_SHA1 01
 /* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
 #define ALLOW_REACHABLE_SHA1   02
 /* Allow request of any sha1. Implies ALLOW_TIP_SHA1 and ALLOW_REACHABLE_SHA1. */
 #define ALLOW_ANY_SHA1 07
-static unsigned int allow_unadvertised_object_request;
 
 /*
  * Please annotate, and if possible group together, fields used only
@@ -83,6 +83,9 @@ struct upload_pack_data {
        /* 0 for no sideband, otherwise DEFAULT_PACKET_MAX or LARGE_PACKET_MAX */
        int use_sideband;
 
+       /* See ALLOW_* values defined above */
+       unsigned int allow_unadvertised_object_request;
+
        struct list_objects_filter_options filter_options;
 
        struct packet_writer writer;
@@ -514,7 +517,8 @@ static int get_common_commits(struct upload_pack_data *data,
        }
 }
 
-static int is_our_ref(struct object *o)
+static int is_our_ref(struct object *o,
+                     unsigned int allow_unadvertised_object_request)
 {
        int allow_hidden_ref = (allow_unadvertised_object_request &
                        (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1));
@@ -526,7 +530,8 @@ static int is_our_ref(struct object *o)
  */
 static int do_reachable_revlist(struct child_process *cmd,
                                struct object_array *src,
-                               struct object_array *reachable)
+                               struct object_array *reachable,
+                               unsigned int allow_unadvertised_object_request)
 {
        static const char *argv[] = {
                "rev-list", "--stdin", NULL,
@@ -560,7 +565,7 @@ static int do_reachable_revlist(struct child_process *cmd,
                        continue;
                if (reachable && o->type == OBJ_COMMIT)
                        o->flags &= ~TMP_MARK;
-               if (!is_our_ref(o))
+               if (!is_our_ref(o, allow_unadvertised_object_request))
                        continue;
                memcpy(namebuf + 1, oid_to_hex(&o->oid), hexsz);
                if (write_in_full(cmd->in, namebuf, hexsz + 2) < 0)
@@ -569,7 +574,7 @@ static int do_reachable_revlist(struct child_process *cmd,
        namebuf[hexsz] = '\n';
        for (i = 0; i < src->nr; i++) {
                o = src->objects[i].item;
-               if (is_our_ref(o)) {
+               if (is_our_ref(o, allow_unadvertised_object_request)) {
                        if (reachable)
                                add_object_array(o, NULL, reachable);
                        continue;
@@ -596,7 +601,7 @@ error:
        return -1;
 }
 
-static int get_reachable_list(struct object_array *src,
+static int get_reachable_list(struct upload_pack_data *data,
                              struct object_array *reachable)
 {
        struct child_process cmd = CHILD_PROCESS_INIT;
@@ -605,7 +610,8 @@ static int get_reachable_list(struct object_array *src,
        char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
        const unsigned hexsz = the_hash_algo->hexsz;
 
-       if (do_reachable_revlist(&cmd, src, reachable) < 0)
+       if (do_reachable_revlist(&cmd, &data->shallows, reachable,
+                                data->allow_unadvertised_object_request) < 0)
                return -1;
 
        while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) {
@@ -636,13 +642,15 @@ static int get_reachable_list(struct object_array *src,
        return 0;
 }
 
-static int has_unreachable(struct object_array *src)
+static int has_unreachable(struct object_array *src,
+                          unsigned int allow_unadvertised_object_request)
 {
        struct child_process cmd = CHILD_PROCESS_INIT;
        char buf[1];
        int i;
 
-       if (do_reachable_revlist(&cmd, src, NULL) < 0)
+       if (do_reachable_revlist(&cmd, src, NULL,
+                                allow_unadvertised_object_request) < 0)
                return 1;
 
        /*
@@ -683,9 +691,10 @@ static void check_non_tip(struct upload_pack_data *data)
         * non-tip requests can never happen.
         */
        if (!data->stateless_rpc
-           && !(allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1))
+           && !(data->allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1))
                goto error;
-       if (!has_unreachable(&data->want_obj))
+       if (!has_unreachable(&data->want_obj,
+                            data->allow_unadvertised_object_request))
                /* All the non-tip ones are ancestors of what we advertised */
                return;
 
@@ -693,7 +702,7 @@ error:
        /* Pick one of them (we know there at least is one) */
        for (i = 0; i < data->want_obj.nr; i++) {
                struct object *o = data->want_obj.objects[i].item;
-               if (!is_our_ref(o)) {
+               if (!is_our_ref(o, data->allow_unadvertised_object_request)) {
                        packet_writer_error(&data->writer,
                                            "upload-pack: not our ref %s",
                                            oid_to_hex(&o->oid));
@@ -774,7 +783,7 @@ static void deepen(struct upload_pack_data *data, int depth)
                head_ref_namespaced(check_ref, NULL);
                for_each_namespaced_ref(check_ref, NULL);
 
-               get_reachable_list(&data->shallows, &reachable_shallows);
+               get_reachable_list(data, &reachable_shallows);
                result = get_shallow_commits(&reachable_shallows,
                                             depth + 1,
                                             SHALLOW, NOT_SHALLOW);
@@ -992,8 +1001,8 @@ static void receive_needs(struct upload_pack_data *data,
                }
                if (!(o->flags & WANTED)) {
                        o->flags |= WANTED;
-                       if (!((allow_unadvertised_object_request & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1
-                             || is_our_ref(o)))
+                       if (!((data->allow_unadvertised_object_request & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1
+                             || is_our_ref(o, data->allow_unadvertised_object_request)))
                                has_non_tip = 1;
                        add_object_array(o, NULL, &data->want_obj);
                }
@@ -1072,9 +1081,9 @@ static int send_ref(const char *refname, const struct object_id *oid,
                packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s agent=%s\n",
                             oid_to_hex(oid), refname_nons,
                             0, capabilities,
-                            (allow_unadvertised_object_request & ALLOW_TIP_SHA1) ?
+                            (data->allow_unadvertised_object_request & ALLOW_TIP_SHA1) ?
                                     " allow-tip-sha1-in-want" : "",
-                            (allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1) ?
+                            (data->allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1) ?
                                     " allow-reachable-sha1-in-want" : "",
                             data->stateless_rpc ? " no-done" : "",
                             symref_info.buf,
@@ -1112,19 +1121,19 @@ static int upload_pack_config(const char *var, const char *value, void *cb_data)
 
        if (!strcmp("uploadpack.allowtipsha1inwant", var)) {
                if (git_config_bool(var, value))
-                       allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
+                       data->allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
                else
-                       allow_unadvertised_object_request &= ~ALLOW_TIP_SHA1;
+                       data->allow_unadvertised_object_request &= ~ALLOW_TIP_SHA1;
        } else if (!strcmp("uploadpack.allowreachablesha1inwant", var)) {
                if (git_config_bool(var, value))
-                       allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
+                       data->allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
                else
-                       allow_unadvertised_object_request &= ~ALLOW_REACHABLE_SHA1;
+                       data->allow_unadvertised_object_request &= ~ALLOW_REACHABLE_SHA1;
        } else if (!strcmp("uploadpack.allowanysha1inwant", var)) {
                if (git_config_bool(var, value))
-                       allow_unadvertised_object_request |= ALLOW_ANY_SHA1;
+                       data->allow_unadvertised_object_request |= ALLOW_ANY_SHA1;
                else
-                       allow_unadvertised_object_request &= ~ALLOW_ANY_SHA1;
+                       data->allow_unadvertised_object_request &= ~ALLOW_ANY_SHA1;
        } else if (!strcmp("uploadpack.keepalive", var)) {
                data->keepalive = git_config_int(var, value);
                if (!data->keepalive)