upload-pack: prepare to extend allow-tip-sha1-in-want

To allow future extensions, e.g. allowing non-tip sha1, replace the
boolean allow_tip_sha1_in_want variable with the flag-style
allow_request_with_bare_object_name variable.

Signed-off-by: Fredrik Medley <fredrik.medley@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/fetch-pack.c b/fetch-pack.c
index 48526aa54bbb8458a10fc178f4fa5a429b77bc87..ff5bd5c48b990d4fc29e1daa1d9fc6f2f24a18eb 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -43,7 +43,10 @@ static int marked;
 #define MAX_IN_VAIN 256
 
 static struct prio_queue rev_list = { compare_commits_by_commit_date };
 #define MAX_IN_VAIN 256
 
 static struct prio_queue rev_list = { compare_commits_by_commit_date };

-static int non_common_revs, multi_ack, use_sideband, allow_tip_sha1_in_want;
+static int non_common_revs, multi_ack, use_sideband;
+/* Allow specifying sha1 if it is a ref tip. */
+#define ALLOW_TIP_SHA1 01
+static unsigned int allow_unadvertised_object_request;

 
 static void rev_list_push(struct commit *commit, int mark)
 {
 
 static void rev_list_push(struct commit *commit, int mark)
 {


@@ -542,7 +545,7 @@ static void filter_refs(struct fetch_pack_args *args,
        }
 
        /* Append unmatched requests to the list */
        }
 
        /* Append unmatched requests to the list */

-       if (allow_tip_sha1_in_want) {
+       if ((allow_unadvertised_object_request & ALLOW_TIP_SHA1)) {

                for (i = 0; i < nr_sought; i++) {
                        unsigned char sha1[20];
 
                for (i = 0; i < nr_sought; i++) {
                        unsigned char sha1[20];
 


@@ -821,7 +824,7 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
        if (server_supports("allow-tip-sha1-in-want")) {
                if (args->verbose)
                        fprintf(stderr, "Server supports allow-tip-sha1-in-want\n");
        if (server_supports("allow-tip-sha1-in-want")) {
                if (args->verbose)
                        fprintf(stderr, "Server supports allow-tip-sha1-in-want\n");

-               allow_tip_sha1_in_want = 1;
+               allow_unadvertised_object_request |= ALLOW_TIP_SHA1;

        }
        if (!server_supports("thin-pack"))
                args->use_thin_pack = 0;
        }
        if (!server_supports("thin-pack"))
                args->use_thin_pack = 0;

diff --git a/upload-pack.c b/upload-pack.c
index aa845765009ac7fb9105851306c3288b3f602369..be8c724a45e1507a695dd1160da4760342b9809e 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -35,7 +35,9 @@ static int multi_ack;
 static int no_done;
 static int use_thin_pack, use_ofs_delta, use_include_tag;
 static int no_progress, daemon_mode;
 static int no_done;
 static int use_thin_pack, use_ofs_delta, use_include_tag;
 static int no_progress, daemon_mode;

-static int allow_tip_sha1_in_want;
+/* Allow specifying sha1 if it is a ref tip. */
+#define ALLOW_TIP_SHA1 01
+static unsigned int allow_unadvertised_object_request;

 static int shallow_nr;
 static struct object_array have_obj;
 static struct object_array want_obj;
 static int shallow_nr;
 static struct object_array have_obj;
 static struct object_array want_obj;


@@ -442,8 +444,8 @@ static int get_common_commits(void)
 
 static int is_our_ref(struct object *o)
 {
 
 static int is_our_ref(struct object *o)
 {

-       return o->flags &
-               ((allow_tip_sha1_in_want ? HIDDEN_REF : 0) | OUR_REF);
+       int allow_hidden_ref = (allow_unadvertised_object_request & ALLOW_TIP_SHA1);
+       return o->flags & ((allow_hidden_ref ? HIDDEN_REF : 0) | OUR_REF);

 }
 
 static void check_non_tip(void)
 }
 
 static void check_non_tip(void)


@@ -727,7 +729,8 @@ static int send_ref(const char *refname, const unsigned char *sha1, int flag, vo
                packet_write(1, "%s %s%c%s%s%s%s agent=%s\n",
                             sha1_to_hex(sha1), refname_nons,
                             0, capabilities,
                packet_write(1, "%s %s%c%s%s%s%s agent=%s\n",
                             sha1_to_hex(sha1), refname_nons,
                             0, capabilities,

-                            allow_tip_sha1_in_want ? " allow-tip-sha1-in-want" : "",
+                            (allow_unadvertised_object_request & ALLOW_TIP_SHA1) ?
+                                    " allow-tip-sha1-in-want" : "",

                             stateless_rpc ? " no-done" : "",
                             symref_info.buf,
                             git_user_agent_sanitized());
                             stateless_rpc ? " no-done" : "",
                             symref_info.buf,
                             git_user_agent_sanitized());


@@ -787,9 +790,12 @@ static void upload_pack(void)
 
 static int upload_pack_config(const char *var, const char *value, void *unused)
 {
 
 static int upload_pack_config(const char *var, const char *value, void *unused)
 {

-       if (!strcmp("uploadpack.allowtipsha1inwant", var))
-               allow_tip_sha1_in_want = git_config_bool(var, value);
-       else if (!strcmp("uploadpack.keepalive", var)) {
+       if (!strcmp("uploadpack.allowtipsha1inwant", var)) {
+               if (git_config_bool(var, value))
+                       allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
+               else
+                       allow_unadvertised_object_request &= ~ALLOW_TIP_SHA1;
+       } else if (!strcmp("uploadpack.keepalive", var)) {

                keepalive = git_config_int(var, value);
                if (!keepalive)
                        keepalive = -1;
                keepalive = git_config_int(var, value);
                if (!keepalive)
                        keepalive = -1;