Merge branch 'jk/uploadpack-packobjectshook-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:58:08 +0000 (22:58 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:58:09 +0000 (22:58 +0900)
Code clean-up that results in a small bugfix.

* jk/uploadpack-packobjectshook-fix:
upload-pack: fix broken if/else chain in config callback

1  2 
upload-pack.c
diff --combined upload-pack.c
index 2ae9d9bb475214070529e22cc3f186afebbc6c7c,a47e4c2692e24085fdbf7f523b334bd193f17305..9d4d6ad82f588d153dd7385f6c84600bbca53a5f
@@@ -3,8 -3,6 +3,8 @@@
  #include "refs.h"
  #include "pkt-line.h"
  #include "sideband.h"
 +#include "repository.h"
 +#include "object-store.h"
  #include "tag.h"
  #include "object.h"
  #include "commit.h"
@@@ -24,7 -22,6 +24,7 @@@
  #include "quote.h"
  #include "upload-pack.h"
  #include "serve.h"
 +#include "commit-graph.h"
  
  /* Remember to update object flag allocation in object.h */
  #define THEY_HAVE     (1u << 11)
@@@ -67,7 -64,6 +67,7 @@@ static const char *pack_objects_hook
  
  static int filter_capability_requested;
  static int allow_filter;
 +static int allow_ref_in_want;
  static struct list_objects_filter_options filter_options;
  
  static void reset_timeout(void)
@@@ -314,7 -310,7 +314,7 @@@ static int got_oid(const char *hex, str
        if (!has_object_file(oid))
                return -1;
  
 -      o = parse_object(oid);
 +      o = parse_object(the_repository, oid);
        if (!o)
                die("oops (%s)", oid_to_hex(oid));
        if (o->type == OBJ_COMMIT) {
@@@ -352,7 -348,7 +352,7 @@@ static int reachable(struct commit *wan
                        break;
                }
                if (!commit->object.parsed)
 -                      parse_object(&commit->object.oid);
 +                      parse_object(the_repository, &commit->object.oid);
                if (commit->object.flags & REACHABLE)
                        continue;
                commit->object.flags |= REACHABLE;
@@@ -382,7 -378,7 +382,7 @@@ static int ok_to_give_up(void
  
                if (want->flags & COMMON_KNOWN)
                        continue;
 -              want = deref_tag(want, "a want line", 0);
 +              want = deref_tag(the_repository, want, "a want line", 0);
                if (!want || want->type != OBJ_COMMIT) {
                        /* no way to tell if this is reachable by
                         * looking at the ancestry chain alone, so
@@@ -572,7 -568,7 +572,7 @@@ static int get_reachable_list(struct ob
                if (parse_oid_hex(namebuf, &sha1, &p) || *p != '\n')
                        break;
  
 -              o = lookup_object(sha1.hash);
 +              o = lookup_object(the_repository, sha1.hash);
                if (o && o->type == OBJ_COMMIT) {
                        o->flags &= ~TMP_MARK;
                }
@@@ -662,7 -658,7 +662,7 @@@ static void send_shallow(struct commit_
                if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
                        packet_write_fmt(1, "shallow %s",
                                         oid_to_hex(&object->oid));
 -                      register_shallow(&object->oid);
 +                      register_shallow(the_repository, &object->oid);
                        shallow_nr++;
                }
                result = result->next;
@@@ -699,14 -695,14 +699,14 @@@ static void send_unshallow(const struc
                        add_object_array(object, NULL, &extra_edge_obj);
                }
                /* make sure commit traversal conforms to client */
 -              register_shallow(&object->oid);
 +              register_shallow(the_repository, &object->oid);
        }
  }
  
  static void deepen(int depth, int deepen_relative,
                   struct object_array *shallows)
  {
 -      if (depth == INFINITE_DEPTH && !is_repository_shallow()) {
 +      if (depth == INFINITE_DEPTH && !is_repository_shallow(the_repository)) {
                int i;
  
                for (i = 0; i < shallows->nr; i++) {
@@@ -741,7 -737,6 +741,7 @@@ static void deepen_by_rev_list(int ac, 
  {
        struct commit_list *result;
  
 +      close_commit_graph(the_repository);
        result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW);
        send_shallow(result);
        free_commit_list(result);
@@@ -787,8 -782,7 +787,8 @@@ static int send_shallow_list(int depth
                if (shallows->nr > 0) {
                        int i;
                        for (i = 0; i < shallows->nr; i++)
 -                              register_shallow(&shallows->objects[i].item->oid);
 +                              register_shallow(the_repository,
 +                                               &shallows->objects[i].item->oid);
                }
        }
  
@@@ -804,7 -798,7 +804,7 @@@ static int process_shallow(const char *
                struct object *object;
                if (get_oid_hex(arg, &oid))
                        die("invalid shallow line: %s", line);
 -              object = parse_object(&oid);
 +              object = parse_object(the_repository, &oid);
                if (!object)
                        return 1;
                if (object->type != OBJ_COMMIT)
@@@ -930,7 -924,7 +930,7 @@@ static void receive_needs(void
                if (allow_filter && parse_feature_request(features, "filter"))
                        filter_capability_requested = 1;
  
 -              o = parse_object(&oid_buf);
 +              o = parse_object(the_repository, &oid_buf);
                if (!o) {
                        packet_write_fmt(1,
                                         "ERR upload-pack: not our ref %s",
@@@ -1076,14 -1070,15 +1076,17 @@@ static int upload_pack_config(const cha
                keepalive = git_config_int(var, value);
                if (!keepalive)
                        keepalive = -1;
-       } else if (current_config_scope() != CONFIG_SCOPE_REPO) {
-               if (!strcmp("uploadpack.packobjectshook", var))
-                       return git_config_string(&pack_objects_hook, var, value);
        } else if (!strcmp("uploadpack.allowfilter", var)) {
                allow_filter = git_config_bool(var, value);
 +      } else if (!strcmp("uploadpack.allowrefinwant", var)) {
 +              allow_ref_in_want = git_config_bool(var, value);
        }
+       if (current_config_scope() != CONFIG_SCOPE_REPO) {
+               if (!strcmp("uploadpack.packobjectshook", var))
+                       return git_config_string(&pack_objects_hook, var, value);
+       }
        return parse_hide_refs_config(var, value, "uploadpack");
  }
  
@@@ -1122,7 -1117,6 +1125,7 @@@ void upload_pack(struct upload_pack_opt
  
  struct upload_pack_data {
        struct object_array wants;
 +      struct string_list wanted_refs;
        struct oid_array haves;
  
        struct object_array shallows;
  static void upload_pack_data_init(struct upload_pack_data *data)
  {
        struct object_array wants = OBJECT_ARRAY_INIT;
 +      struct string_list wanted_refs = STRING_LIST_INIT_DUP;
        struct oid_array haves = OID_ARRAY_INIT;
        struct object_array shallows = OBJECT_ARRAY_INIT;
        struct string_list deepen_not = STRING_LIST_INIT_DUP;
  
        memset(data, 0, sizeof(*data));
        data->wants = wants;
 +      data->wanted_refs = wanted_refs;
        data->haves = haves;
        data->shallows = shallows;
        data->deepen_not = deepen_not;
  static void upload_pack_data_clear(struct upload_pack_data *data)
  {
        object_array_clear(&data->wants);
 +      string_list_clear(&data->wanted_refs, 1);
        oid_array_clear(&data->haves);
        object_array_clear(&data->shallows);
        string_list_clear(&data->deepen_not, 0);
@@@ -1177,7 -1168,7 +1180,7 @@@ static int parse_want(const char *line
                        die("git upload-pack: protocol error, "
                            "expected to get oid, not '%s'", line);
  
 -              o = parse_object(&oid);
 +              o = parse_object(the_repository, &oid);
                if (!o) {
                        packet_write_fmt(1,
                                         "ERR upload-pack: not our ref %s",
        return 0;
  }
  
 +static int parse_want_ref(const char *line, struct string_list *wanted_refs)
 +{
 +      const char *arg;
 +      if (skip_prefix(line, "want-ref ", &arg)) {
 +              struct object_id oid;
 +              struct string_list_item *item;
 +              struct object *o;
 +
 +              if (read_ref(arg, &oid)) {
 +                      packet_write_fmt(1, "ERR unknown ref %s", arg);
 +                      die("unknown ref %s", arg);
 +              }
 +
 +              item = string_list_append(wanted_refs, arg);
 +              item->util = oiddup(&oid);
 +
 +              o = parse_object_or_die(&oid, arg);
 +              if (!(o->flags & WANTED)) {
 +                      o->flags |= WANTED;
 +                      add_object_array(o, NULL, &want_obj);
 +              }
 +
 +              return 1;
 +      }
 +
 +      return 0;
 +}
 +
  static int parse_have(const char *line, struct oid_array *haves)
  {
        const char *arg;
@@@ -1250,8 -1213,6 +1253,8 @@@ static void process_args(struct packet_
                /* process want */
                if (parse_want(arg))
                        continue;
 +              if (allow_ref_in_want && parse_want_ref(arg, &data->wanted_refs))
 +                      continue;
                /* process have line */
                if (parse_have(arg, &data->haves))
                        continue;
@@@ -1319,7 -1280,7 +1322,7 @@@ static int process_haves(struct oid_arr
  
                oid_array_append(common, oid);
  
 -              o = parse_object(oid);
 +              o = parse_object(the_repository, oid);
                if (!o)
                        die("oops (%s)", oid_to_hex(oid));
                if (o->type == OBJ_COMMIT) {
@@@ -1394,37 -1355,18 +1397,37 @@@ static int process_haves_and_send_acks(
        return ret;
  }
  
 +static void send_wanted_ref_info(struct upload_pack_data *data)
 +{
 +      const struct string_list_item *item;
 +
 +      if (!data->wanted_refs.nr)
 +              return;
 +
 +      packet_write_fmt(1, "wanted-refs\n");
 +
 +      for_each_string_list_item(item, &data->wanted_refs) {
 +              packet_write_fmt(1, "%s %s\n",
 +                               oid_to_hex(item->util),
 +                               item->string);
 +      }
 +
 +      packet_delim(1);
 +}
 +
  static void send_shallow_info(struct upload_pack_data *data)
  {
        /* No shallow info needs to be sent */
        if (!data->depth && !data->deepen_rev_list && !data->shallows.nr &&
 -          !is_repository_shallow())
 +          !is_repository_shallow(the_repository))
                return;
  
        packet_write_fmt(1, "shallow-info\n");
  
        if (!send_shallow_list(data->depth, data->deepen_rev_list,
                               data->deepen_since, &data->deepen_not,
 -                             &data->shallows) && is_repository_shallow())
 +                             &data->shallows) &&
 +          is_repository_shallow(the_repository))
                deepen(INFINITE_DEPTH, data->deepen_relative, &data->shallows);
  
        packet_delim(1);
@@@ -1479,7 -1421,6 +1482,7 @@@ int upload_pack_v2(struct repository *r
                                state = FETCH_DONE;
                        break;
                case FETCH_SEND_PACK:
 +                      send_wanted_ref_info(&data);
                        send_shallow_info(&data);
  
                        packet_write_fmt(1, "packfile\n");
@@@ -1500,22 -1441,12 +1503,22 @@@ int upload_pack_advertise(struct reposi
  {
        if (value) {
                int allow_filter_value;
 +              int allow_ref_in_want;
 +
                strbuf_addstr(value, "shallow");
 +
                if (!repo_config_get_bool(the_repository,
                                         "uploadpack.allowfilter",
                                         &allow_filter_value) &&
                    allow_filter_value)
                        strbuf_addstr(value, " filter");
 +
 +              if (!repo_config_get_bool(the_repository,
 +                                       "uploadpack.allowrefinwant",
 +                                       &allow_ref_in_want) &&
 +                  allow_ref_in_want)
 +                      strbuf_addstr(value, " ref-in-want");
        }
 +
        return 1;
  }