Merge branch 'jk/fetch-all-peeled-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Jun 2018 19:53:32 +0000 (12:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Jun 2018 19:53:32 +0000 (12:53 -0700)
"git fetch-pack --all" used to unnecessarily fail upon seeing an
annotated tag that points at an object other than a commit.

* jk/fetch-all-peeled-fix:
fetch-pack: test explicitly that --all can fetch tag references pointing to non-commits
fetch-pack: don't try to fetch peel values with --all

1  2 
fetch-pack.c
t/t5500-fetch-pack.sh
diff --combined fetch-pack.c
index a320ce9872b5e752aeb592a16cc9108ae87e9d71,c85fc6aeed7409c05a2f299105eb3d68b2471ccf..cc7a42fee9fad161e37caacf87a15b2c1e33ec94
@@@ -1,12 -1,10 +1,12 @@@
  #include "cache.h"
 +#include "repository.h"
 +#include "config.h"
  #include "lockfile.h"
  #include "refs.h"
  #include "pkt-line.h"
  #include "commit.h"
  #include "tag.h"
 -#include "exec_cmd.h"
 +#include "exec-cmd.h"
  #include "pack.h"
  #include "sideband.h"
  #include "fetch-pack.h"
@@@ -17,8 -15,6 +17,8 @@@
  #include "version.h"
  #include "prio-queue.h"
  #include "sha1-array.h"
 +#include "oidset.h"
 +#include "packfile.h"
  
  static int transfer_unpack_limit = -1;
  static int fetch_unpack_limit = -1;
@@@ -30,7 -26,6 +30,7 @@@ static int deepen_not_ok
  static int fetch_fsck_objects = -1;
  static int transfer_fsck_objects = -1;
  static int agent_supported;
 +static int server_supports_filtering;
  static struct lock_file shallow_lock;
  static const char *alternate_shallow_file;
  
@@@ -40,7 -35,6 +40,7 @@@
  #define COMMON_REF    (1U << 2)
  #define SEEN          (1U << 3)
  #define POPPED                (1U << 4)
 +#define ALTERNATE     (1U << 5)
  
  static int marked;
  
@@@ -73,41 -67,6 +73,41 @@@ static inline void print_verbose(const 
        fputc('\n', stderr);
  }
  
 +struct alternate_object_cache {
 +      struct object **items;
 +      size_t nr, alloc;
 +};
 +
 +static void cache_one_alternate(const char *refname,
 +                              const struct object_id *oid,
 +                              void *vcache)
 +{
 +      struct alternate_object_cache *cache = vcache;
 +      struct object *obj = parse_object(oid);
 +
 +      if (!obj || (obj->flags & ALTERNATE))
 +              return;
 +
 +      obj->flags |= ALTERNATE;
 +      ALLOC_GROW(cache->items, cache->nr + 1, cache->alloc);
 +      cache->items[cache->nr++] = obj;
 +}
 +
 +static void for_each_cached_alternate(void (*cb)(struct object *))
 +{
 +      static int initialized;
 +      static struct alternate_object_cache cache;
 +      size_t i;
 +
 +      if (!initialized) {
 +              for_each_alternate_ref(cache_one_alternate, &cache);
 +              initialized = 1;
 +      }
 +
 +      for (i = 0; i < cache.nr; i++)
 +              cb(cache.items[i]);
 +}
 +
  static void rev_list_push(struct commit *commit, int mark)
  {
        if (!(commit->object.flags & mark)) {
        }
  }
  
 -static int rev_list_insert_ref(const char *refname, const unsigned char *sha1)
 +static int rev_list_insert_ref(const char *refname, const struct object_id *oid)
  {
 -      struct object *o = deref_tag(parse_object(sha1), refname, 0);
 +      struct object *o = deref_tag(parse_object(oid), refname, 0);
  
        if (o && o->type == OBJ_COMMIT)
                rev_list_push((struct commit *)o, SEEN);
  static int rev_list_insert_ref_oid(const char *refname, const struct object_id *oid,
                                   int flag, void *cb_data)
  {
 -      return rev_list_insert_ref(refname, oid->hash);
 +      return rev_list_insert_ref(refname, oid);
  }
  
  static int clear_marks(const char *refname, const struct object_id *oid,
                       int flag, void *cb_data)
  {
 -      struct object *o = deref_tag(parse_object(oid->hash), refname, 0);
 +      struct object *o = deref_tag(parse_object(oid), refname, 0);
  
        if (o && o->type == OBJ_COMMIT)
                clear_commit_marks((struct commit *)o,
@@@ -188,7 -147,7 +188,7 @@@ static void mark_common(struct commit *
    Get the next rev to send, ignoring the common.
  */
  
 -static const unsigned char *get_rev(void)
 +static const struct object_id *get_rev(void)
  {
        struct commit *commit = NULL;
  
                }
        }
  
 -      return commit->object.oid.hash;
 +      return &commit->object.oid;
  }
  
  enum ack_type {
@@@ -256,18 -215,18 +256,18 @@@ static void consume_shallow_list(struc
        }
  }
  
 -static enum ack_type get_ack(int fd, unsigned char *result_sha1)
 +static enum ack_type get_ack(int fd, struct object_id *result_oid)
  {
        int len;
        char *line = packet_read_line(fd, &len);
        const char *arg;
  
 -      if (!len)
 -              die(_("git fetch-pack: expected ACK/NAK, got EOF"));
 +      if (!line)
 +              die(_("git fetch-pack: expected ACK/NAK, got a flush packet"));
        if (!strcmp(line, "NAK"))
                return NAK;
        if (skip_prefix(line, "ACK ", &arg)) {
 -              if (!get_sha1_hex(arg, result_sha1)) {
 +              if (!get_oid_hex(arg, result_oid)) {
                        arg += 40;
                        len -= arg - line;
                        if (len < 1)
                        return ACK;
                }
        }
 +      if (skip_prefix(line, "ERR ", &arg))
 +              die(_("remote error: %s"), arg);
        die(_("git fetch-pack: expected ACK/NAK, got '%s'"), line);
  }
  
@@@ -296,18 -253,18 +296,18 @@@ static void send_request(struct fetch_p
                write_or_die(fd, buf->buf, buf->len);
  }
  
 -static void insert_one_alternate_ref(const struct ref *ref, void *unused)
 +static void insert_one_alternate_object(struct object *obj)
  {
 -      rev_list_insert_ref(NULL, ref->old_oid.hash);
 +      rev_list_insert_ref(NULL, &obj->oid);
  }
  
  #define INITIAL_FLUSH 16
  #define PIPESAFE_FLUSH 32
  #define LARGE_FLUSH 16384
  
 -static int next_flush(struct fetch_pack_args *args, int count)
 +static int next_flush(int stateless_rpc, int count)
  {
 -      if (args->stateless_rpc) {
 +      if (stateless_rpc) {
                if (count < LARGE_FLUSH)
                        count <<= 1;
                else
  }
  
  static int find_common(struct fetch_pack_args *args,
 -                     int fd[2], unsigned char *result_sha1,
 +                     int fd[2], struct object_id *result_oid,
                       struct ref *refs)
  {
        int fetching;
        int count = 0, flushes = 0, flush_at = INITIAL_FLUSH, retval;
 -      const unsigned char *sha1;
 +      const struct object_id *oid;
        unsigned in_vain = 0;
        int got_continue = 0;
        int got_ready = 0;
        marked = 1;
  
        for_each_ref(rev_list_insert_ref_oid, NULL);
 -      for_each_alternate_ref(insert_one_alternate_ref, NULL);
 +      for_each_cached_alternate(insert_one_alternate_object);
  
        fetching = 0;
        for ( ; refs ; refs = refs->next) {
 -              unsigned char *remote = refs->old_oid.hash;
 +              struct object_id *remote = &refs->old_oid;
                const char *remote_hex;
                struct object *o;
  
                 * interested in the case we *know* the object is
                 * reachable and we have already scanned it.
                 */
 -              if (((o = lookup_object(remote)) != NULL) &&
 +              if (((o = lookup_object(remote->hash)) != NULL) &&
                                (o->flags & COMPLETE)) {
                        continue;
                }
  
 -              remote_hex = sha1_to_hex(remote);
 +              remote_hex = oid_to_hex(remote);
                if (!fetching) {
                        struct strbuf c = STRBUF_INIT;
                        if (multi_ack == 2)     strbuf_addstr(&c, " multi_ack_detailed");
                        if (deepen_not_ok)      strbuf_addstr(&c, " deepen-not");
                        if (agent_supported)    strbuf_addf(&c, " agent=%s",
                                                            git_user_agent_sanitized());
 +                      if (args->filter_options.choice)
 +                              strbuf_addstr(&c, " filter");
                        packet_buf_write(&req_buf, "want %s%s\n", remote_hex, c.buf);
                        strbuf_release(&c);
                } else
        if (args->depth > 0)
                packet_buf_write(&req_buf, "deepen %d", args->depth);
        if (args->deepen_since) {
 -              unsigned long max_age = approxidate(args->deepen_since);
 -              packet_buf_write(&req_buf, "deepen-since %lu", max_age);
 +              timestamp_t max_age = approxidate(args->deepen_since);
 +              packet_buf_write(&req_buf, "deepen-since %"PRItime, max_age);
        }
        if (args->deepen_not) {
                int i;
                        packet_buf_write(&req_buf, "deepen-not %s", s->string);
                }
        }
 +      if (server_supports_filtering && args->filter_options.choice)
 +              packet_buf_write(&req_buf, "filter %s",
 +                               args->filter_options.filter_spec);
        packet_buf_flush(&req_buf);
        state_len = req_buf.len;
  
        if (args->deepen) {
                char *line;
                const char *arg;
 -              unsigned char sha1[20];
 +              struct object_id oid;
  
                send_request(args, fd[1], &req_buf);
                while ((line = packet_read_line(fd[0], NULL))) {
                        if (skip_prefix(line, "shallow ", &arg)) {
 -                              if (get_sha1_hex(arg, sha1))
 +                              if (get_oid_hex(arg, &oid))
                                        die(_("invalid shallow line: %s"), line);
 -                              register_shallow(sha1);
 +                              register_shallow(&oid);
                                continue;
                        }
                        if (skip_prefix(line, "unshallow ", &arg)) {
 -                              if (get_sha1_hex(arg, sha1))
 +                              if (get_oid_hex(arg, &oid))
                                        die(_("invalid unshallow line: %s"), line);
 -                              if (!lookup_object(sha1))
 +                              if (!lookup_object(oid.hash))
                                        die(_("object not found: %s"), line);
                                /* make sure that it is parsed as shallow */
 -                              if (!parse_object(sha1))
 +                              if (!parse_object(&oid))
                                        die(_("error in object: %s"), line);
 -                              if (unregister_shallow(sha1))
 +                              if (unregister_shallow(&oid))
                                        die(_("no shallow found: %s"), line);
                                continue;
                        }
  
        flushes = 0;
        retval = -1;
 -      while ((sha1 = get_rev())) {
 -              packet_buf_write(&req_buf, "have %s\n", sha1_to_hex(sha1));
 -              print_verbose(args, "have %s", sha1_to_hex(sha1));
 +      if (args->no_dependents)
 +              goto done;
 +      while ((oid = get_rev())) {
 +              packet_buf_write(&req_buf, "have %s\n", oid_to_hex(oid));
 +              print_verbose(args, "have %s", oid_to_hex(oid));
                in_vain++;
                if (flush_at <= ++count) {
                        int ack;
                        send_request(args, fd[1], &req_buf);
                        strbuf_setlen(&req_buf, state_len);
                        flushes++;
 -                      flush_at = next_flush(args, count);
 +                      flush_at = next_flush(args->stateless_rpc, count);
  
                        /*
                         * We keep one window "ahead" of the other side, and
  
                        consume_shallow_list(args, fd[0]);
                        do {
 -                              ack = get_ack(fd[0], result_sha1);
 +                              ack = get_ack(fd[0], result_oid);
                                if (ack)
                                        print_verbose(args, _("got %s %d %s"), "ack",
 -                                                    ack, sha1_to_hex(result_sha1));
 +                                                    ack, oid_to_hex(result_oid));
                                switch (ack) {
                                case ACK:
                                        flushes = 0;
                                case ACK_ready:
                                case ACK_continue: {
                                        struct commit *commit =
 -                                              lookup_commit(result_sha1);
 +                                              lookup_commit(result_oid);
                                        if (!commit)
 -                                              die(_("invalid commit %s"), sha1_to_hex(result_sha1));
 +                                              die(_("invalid commit %s"), oid_to_hex(result_oid));
                                        if (args->stateless_rpc
                                         && ack == ACK_common
                                         && !(commit->object.flags & COMMON)) {
                                                 * on the next RPC request so the peer knows
                                                 * it is in common with us.
                                                 */
 -                                              const char *hex = sha1_to_hex(result_sha1);
 +                                              const char *hex = oid_to_hex(result_oid);
                                                packet_buf_write(&req_buf, "have %s\n", hex);
                                                state_len = req_buf.len;
                                                /*
@@@ -550,10 -500,10 +550,10 @@@ done
        if (!got_ready || !no_done)
                consume_shallow_list(args, fd[0]);
        while (flushes || multi_ack) {
 -              int ack = get_ack(fd[0], result_sha1);
 +              int ack = get_ack(fd[0], result_oid);
                if (ack) {
                        print_verbose(args, _("got %s (%d) %s"), "ack",
 -                                    ack, sha1_to_hex(result_sha1));
 +                                    ack, oid_to_hex(result_oid));
                        if (ack == ACK)
                                return 0;
                        multi_ack = 1;
  
  static struct commit_list *complete;
  
 -static int mark_complete(const unsigned char *sha1)
 +static int mark_complete(const struct object_id *oid)
  {
 -      struct object *o = parse_object(sha1);
 +      struct object *o = parse_object(oid);
  
        while (o && o->type == OBJ_TAG) {
                struct tag *t = (struct tag *) o;
                if (!t->tagged)
                        break; /* broken repository */
                o->flags |= COMPLETE;
 -              o = parse_object(t->tagged->oid.hash);
 +              o = parse_object(&t->tagged->oid);
        }
        if (o && o->type == OBJ_COMMIT) {
                struct commit *commit = (struct commit *)o;
  static int mark_complete_oid(const char *refname, const struct object_id *oid,
                             int flag, void *cb_data)
  {
 -      return mark_complete(oid->hash);
 +      return mark_complete(oid);
  }
  
  static void mark_recent_complete_commits(struct fetch_pack_args *args,
 -                                       unsigned long cutoff)
 +                                       timestamp_t cutoff)
  {
        while (complete && cutoff <= complete->item->date) {
                print_verbose(args, _("Marking %s as complete"),
        }
  }
  
 +static void add_refs_to_oidset(struct oidset *oids, struct ref *refs)
 +{
 +      for (; refs; refs = refs->next)
 +              oidset_insert(oids, &refs->old_oid);
 +}
 +
 +static int tip_oids_contain(struct oidset *tip_oids,
 +                          struct ref *unmatched, struct ref *newlist,
 +                          const struct object_id *id)
 +{
 +      /*
 +       * Note that this only looks at the ref lists the first time it's
 +       * called. This works out in filter_refs() because even though it may
 +       * add to "newlist" between calls, the additions will always be for
 +       * oids that are already in the set.
 +       */
 +      if (!tip_oids->map.map.tablesize) {
 +              add_refs_to_oidset(tip_oids, unmatched);
 +              add_refs_to_oidset(tip_oids, newlist);
 +      }
 +      return oidset_contains(tip_oids, id);
 +}
 +
  static void filter_refs(struct fetch_pack_args *args,
                        struct ref **refs,
                        struct ref **sought, int nr_sought)
  {
        struct ref *newlist = NULL;
        struct ref **newtail = &newlist;
 +      struct ref *unmatched = NULL;
        struct ref *ref, *next;
 +      struct oidset tip_oids = OIDSET_INIT;
        int i;
  
        i = 0;
                                        break; /* definitely do not have it */
                                else if (cmp == 0) {
                                        keep = 1; /* definitely have it */
 -                                      sought[i]->matched = 1;
 +                                      sought[i]->match_status = REF_MATCHED;
                                }
                                i++;
                        }
-               }
  
-               if (!keep && args->fetch_all &&
-                   (!args->deepen || !starts_with(ref->name, "refs/tags/")))
-                       keep = 1;
+                       if (!keep && args->fetch_all &&
+                           (!args->deepen || !starts_with(ref->name, "refs/tags/")))
+                               keep = 1;
+               }
  
                if (keep) {
                        *newtail = ref;
                        ref->next = NULL;
                        newtail = &ref->next;
                } else {
 -                      free(ref);
 +                      ref->next = unmatched;
 +                      unmatched = ref;
                }
        }
  
        /* Append unmatched requests to the list */
 -      if ((allow_unadvertised_object_request &
 -          (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1))) {
 -              for (i = 0; i < nr_sought; i++) {
 -                      unsigned char sha1[20];
 +      for (i = 0; i < nr_sought; i++) {
 +              struct object_id oid;
 +              const char *p;
  
 -                      ref = sought[i];
 -                      if (ref->matched)
 -                              continue;
 -                      if (get_sha1_hex(ref->name, sha1) ||
 -                          ref->name[40] != '\0' ||
 -                          hashcmp(sha1, ref->old_oid.hash))
 -                              continue;
 +              ref = sought[i];
 +              if (ref->match_status != REF_NOT_MATCHED)
 +                      continue;
 +              if (parse_oid_hex(ref->name, &oid, &p) ||
 +                  *p != '\0' ||
 +                  oidcmp(&oid, &ref->old_oid))
 +                      continue;
  
 -                      ref->matched = 1;
 +              if ((allow_unadvertised_object_request &
 +                   (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1)) ||
 +                  tip_oids_contain(&tip_oids, unmatched, newlist,
 +                                   &ref->old_oid)) {
 +                      ref->match_status = REF_MATCHED;
                        *newtail = copy_ref(ref);
                        newtail = &(*newtail)->next;
 +              } else {
 +                      ref->match_status = REF_UNADVERTISED_NOT_ALLOWED;
                }
        }
 +
 +      oidset_clear(&tip_oids);
 +      for (ref = unmatched; ref; ref = next) {
 +              next = ref->next;
 +              free(ref);
 +      }
 +
        *refs = newlist;
  }
  
 -static void mark_alternate_complete(const struct ref *ref, void *unused)
 +static void mark_alternate_complete(struct object *obj)
  {
 -      mark_complete(ref->old_oid.hash);
 +      mark_complete(&obj->oid);
 +}
 +
 +struct loose_object_iter {
 +      struct oidset *loose_object_set;
 +      struct ref *refs;
 +};
 +
 +/*
 + *  If the number of refs is not larger than the number of loose objects,
 + *  this function stops inserting.
 + */
 +static int add_loose_objects_to_set(const struct object_id *oid,
 +                                  const char *path,
 +                                  void *data)
 +{
 +      struct loose_object_iter *iter = data;
 +      oidset_insert(iter->loose_object_set, oid);
 +      if (iter->refs == NULL)
 +              return 1;
 +
 +      iter->refs = iter->refs->next;
 +      return 0;
  }
  
  static int everything_local(struct fetch_pack_args *args,
  {
        struct ref *ref;
        int retval;
 -      unsigned long cutoff = 0;
 +      int old_save_commit_buffer = save_commit_buffer;
 +      timestamp_t cutoff = 0;
 +      struct oidset loose_oid_set = OIDSET_INIT;
 +      int use_oidset = 0;
 +      struct loose_object_iter iter = {&loose_oid_set, *refs};
 +
 +      /* Enumerate all loose objects or know refs are not so many. */
 +      use_oidset = !for_each_loose_object(add_loose_objects_to_set,
 +                                          &iter, 0);
  
        save_commit_buffer = 0;
  
        for (ref = *refs; ref; ref = ref->next) {
                struct object *o;
 +              unsigned int flags = OBJECT_INFO_QUICK;
  
 -              if (!has_object_file(&ref->old_oid))
 -                      continue;
 +              if (use_oidset &&
 +                  !oidset_contains(&loose_oid_set, &ref->old_oid)) {
 +                      /*
 +                       * I know this does not exist in the loose form,
 +                       * so check if it exists in a non-loose form.
 +                       */
 +                      flags |= OBJECT_INFO_IGNORE_LOOSE;
 +              }
  
 -              o = parse_object(ref->old_oid.hash);
 +              if (!has_object_file_with_flags(&ref->old_oid, flags))
 +                      continue;
 +              o = parse_object(&ref->old_oid);
                if (!o)
                        continue;
  
                }
        }
  
 -      if (!args->deepen) {
 -              for_each_ref(mark_complete_oid, NULL);
 -              for_each_alternate_ref(mark_alternate_complete, NULL);
 -              commit_list_sort_by_date(&complete);
 -              if (cutoff)
 -                      mark_recent_complete_commits(args, cutoff);
 -      }
 +      oidset_clear(&loose_oid_set);
  
 -      /*
 -       * Mark all complete remote refs as common refs.
 -       * Don't mark them common yet; the server has to be told so first.
 -       */
 -      for (ref = *refs; ref; ref = ref->next) {
 -              struct object *o = deref_tag(lookup_object(ref->old_oid.hash),
 -                                           NULL, 0);
 +      if (!args->no_dependents) {
 +              if (!args->deepen) {
 +                      for_each_ref(mark_complete_oid, NULL);
 +                      for_each_cached_alternate(mark_alternate_complete);
 +                      commit_list_sort_by_date(&complete);
 +                      if (cutoff)
 +                              mark_recent_complete_commits(args, cutoff);
 +              }
  
 -              if (!o || o->type != OBJ_COMMIT || !(o->flags & COMPLETE))
 -                      continue;
 +              /*
 +               * Mark all complete remote refs as common refs.
 +               * Don't mark them common yet; the server has to be told so first.
 +               */
 +              for (ref = *refs; ref; ref = ref->next) {
 +                      struct object *o = deref_tag(lookup_object(ref->old_oid.hash),
 +                                                   NULL, 0);
  
 -              if (!(o->flags & SEEN)) {
 -                      rev_list_push((struct commit *)o, COMMON_REF | SEEN);
 +                      if (!o || o->type != OBJ_COMMIT || !(o->flags & COMPLETE))
 +                              continue;
 +
 +                      if (!(o->flags & SEEN)) {
 +                              rev_list_push((struct commit *)o, COMMON_REF | SEEN);
  
 -                      mark_common((struct commit *)o, 1, 1);
 +                              mark_common((struct commit *)o, 1, 1);
 +                      }
                }
        }
  
        filter_refs(args, refs, sought, nr_sought);
  
        for (retval = 1, ref = *refs; ref ; ref = ref->next) {
 -              const unsigned char *remote = ref->old_oid.hash;
 +              const struct object_id *remote = &ref->old_oid;
                struct object *o;
  
 -              o = lookup_object(remote);
 +              o = lookup_object(remote->hash);
                if (!o || !(o->flags & COMPLETE)) {
                        retval = 0;
 -                      print_verbose(args, "want %s (%s)", sha1_to_hex(remote),
 +                      print_verbose(args, "want %s (%s)", oid_to_hex(remote),
                                      ref->name);
                        continue;
                }
 -              print_verbose(args, _("already have %s (%s)"), sha1_to_hex(remote),
 +              print_verbose(args, _("already have %s (%s)"), oid_to_hex(remote),
                              ref->name);
        }
 +
 +      save_commit_buffer = old_save_commit_buffer;
 +
        return retval;
  }
  
@@@ -887,7 -753,7 +887,7 @@@ static int get_pack(struct fetch_pack_a
                argv_array_push(&cmd.args, alternate_shallow_file);
        }
  
 -      if (do_keep) {
 +      if (do_keep || args->from_promisor) {
                if (pack_lockfile)
                        cmd.out = -1;
                cmd_name = "index-pack";
                        argv_array_push(&cmd.args, "-v");
                if (args->use_thin_pack)
                        argv_array_push(&cmd.args, "--fix-thin");
 -              if (args->lock_pack || unpack_limit) {
 -                      char hostname[256];
 -                      if (gethostname(hostname, sizeof(hostname)))
 +              if (do_keep && (args->lock_pack || unpack_limit)) {
 +                      char hostname[HOST_NAME_MAX + 1];
 +                      if (xgethostname(hostname, sizeof(hostname)))
                                xsnprintf(hostname, sizeof(hostname), "localhost");
                        argv_array_pushf(&cmd.args,
                                        "--keep=fetch-pack %"PRIuMAX " on %s",
                }
                if (args->check_self_contained_and_connected)
                        argv_array_push(&cmd.args, "--check-self-contained-and-connected");
 +              if (args->from_promisor)
 +                      argv_array_push(&cmd.args, "--promisor");
        }
        else {
                cmd_name = "unpack-objects";
            ? fetch_fsck_objects
            : transfer_fsck_objects >= 0
            ? transfer_fsck_objects
 -          : 0)
 -              argv_array_push(&cmd.args, "--strict");
 +          : 0) {
 +              if (args->from_promisor)
 +                      /*
 +                       * We cannot use --strict in index-pack because it
 +                       * checks both broken objects and links, but we only
 +                       * want to check for broken objects.
 +                       */
 +                      argv_array_push(&cmd.args, "--fsck-objects");
 +              else
 +                      argv_array_push(&cmd.args, "--strict");
 +      }
  
        cmd.in = demux.out;
        cmd.git_cmd = 1;
@@@ -978,7 -833,7 +978,7 @@@ static struct ref *do_fetch_pack(struc
                                 char **pack_lockfile)
  {
        struct ref *ref = copy_ref_list(orig_ref);
 -      unsigned char sha1[20];
 +      struct object_id oid;
        const char *agent_feature;
        int agent_len;
  
        else
                prefer_ofs_delta = 0;
  
 +      if (server_supports("filter")) {
 +              server_supports_filtering = 1;
 +              print_verbose(args, _("Server supports filter"));
 +      } else if (args->filter_options.choice) {
 +              warning("filtering not recognized by server, ignoring");
 +      }
 +
        if ((agent_feature = server_feature_value("agent", &agent_len))) {
                agent_supported = 1;
                if (agent_len)
                packet_flush(fd[1]);
                goto all_done;
        }
 -      if (find_common(args, fd, sha1, ref) < 0)
 +      if (find_common(args, fd, &oid, ref) < 0)
                if (!args->keep_pack)
                        /* When cloning, it is not unusual to have
                         * no common commit.
        return ref;
  }
  
 +static void add_shallow_requests(struct strbuf *req_buf,
 +                               const struct fetch_pack_args *args)
 +{
 +      if (is_repository_shallow())
 +              write_shallow_commits(req_buf, 1, NULL);
 +      if (args->depth > 0)
 +              packet_buf_write(req_buf, "deepen %d", args->depth);
 +      if (args->deepen_since) {
 +              timestamp_t max_age = approxidate(args->deepen_since);
 +              packet_buf_write(req_buf, "deepen-since %"PRItime, max_age);
 +      }
 +      if (args->deepen_not) {
 +              int i;
 +              for (i = 0; i < args->deepen_not->nr; i++) {
 +                      struct string_list_item *s = args->deepen_not->items + i;
 +                      packet_buf_write(req_buf, "deepen-not %s", s->string);
 +              }
 +      }
 +}
 +
 +static void add_wants(const struct ref *wants, struct strbuf *req_buf)
 +{
 +      for ( ; wants ; wants = wants->next) {
 +              const struct object_id *remote = &wants->old_oid;
 +              const char *remote_hex;
 +              struct object *o;
 +
 +              /*
 +               * If that object is complete (i.e. it is an ancestor of a
 +               * local ref), we tell them we have it but do not have to
 +               * tell them about its ancestors, which they already know
 +               * about.
 +               *
 +               * We use lookup_object here because we are only
 +               * interested in the case we *know* the object is
 +               * reachable and we have already scanned it.
 +               */
 +              if (((o = lookup_object(remote->hash)) != NULL) &&
 +                  (o->flags & COMPLETE)) {
 +                      continue;
 +              }
 +
 +              remote_hex = oid_to_hex(remote);
 +              packet_buf_write(req_buf, "want %s\n", remote_hex);
 +      }
 +}
 +
 +static void add_common(struct strbuf *req_buf, struct oidset *common)
 +{
 +      struct oidset_iter iter;
 +      const struct object_id *oid;
 +      oidset_iter_init(common, &iter);
 +
 +      while ((oid = oidset_iter_next(&iter))) {
 +              packet_buf_write(req_buf, "have %s\n", oid_to_hex(oid));
 +      }
 +}
 +
 +static int add_haves(struct strbuf *req_buf, int *haves_to_send, int *in_vain)
 +{
 +      int ret = 0;
 +      int haves_added = 0;
 +      const struct object_id *oid;
 +
 +      while ((oid = get_rev())) {
 +              packet_buf_write(req_buf, "have %s\n", oid_to_hex(oid));
 +              if (++haves_added >= *haves_to_send)
 +                      break;
 +      }
 +
 +      *in_vain += haves_added;
 +      if (!haves_added || *in_vain >= MAX_IN_VAIN) {
 +              /* Send Done */
 +              packet_buf_write(req_buf, "done\n");
 +              ret = 1;
 +      }
 +
 +      /* Increase haves to send on next round */
 +      *haves_to_send = next_flush(1, *haves_to_send);
 +
 +      return ret;
 +}
 +
 +static int send_fetch_request(int fd_out, const struct fetch_pack_args *args,
 +                            const struct ref *wants, struct oidset *common,
 +                            int *haves_to_send, int *in_vain)
 +{
 +      int ret = 0;
 +      struct strbuf req_buf = STRBUF_INIT;
 +
 +      if (server_supports_v2("fetch", 1))
 +              packet_buf_write(&req_buf, "command=fetch");
 +      if (server_supports_v2("agent", 0))
 +              packet_buf_write(&req_buf, "agent=%s", git_user_agent_sanitized());
 +      if (args->server_options && args->server_options->nr &&
 +          server_supports_v2("server-option", 1)) {
 +              int i;
 +              for (i = 0; i < args->server_options->nr; i++)
 +                      packet_write_fmt(fd_out, "server-option=%s",
 +                                       args->server_options->items[i].string);
 +      }
 +
 +      packet_buf_delim(&req_buf);
 +      if (args->use_thin_pack)
 +              packet_buf_write(&req_buf, "thin-pack");
 +      if (args->no_progress)
 +              packet_buf_write(&req_buf, "no-progress");
 +      if (args->include_tag)
 +              packet_buf_write(&req_buf, "include-tag");
 +      if (prefer_ofs_delta)
 +              packet_buf_write(&req_buf, "ofs-delta");
 +
 +      /* Add shallow-info and deepen request */
 +      if (server_supports_feature("fetch", "shallow", 0))
 +              add_shallow_requests(&req_buf, args);
 +      else if (is_repository_shallow() || args->deepen)
 +              die(_("Server does not support shallow requests"));
 +
 +      /* Add filter */
 +      if (server_supports_feature("fetch", "filter", 0) &&
 +          args->filter_options.choice) {
 +              print_verbose(args, _("Server supports filter"));
 +              packet_buf_write(&req_buf, "filter %s",
 +                               args->filter_options.filter_spec);
 +      } else if (args->filter_options.choice) {
 +              warning("filtering not recognized by server, ignoring");
 +      }
 +
 +      /* add wants */
 +      add_wants(wants, &req_buf);
 +
 +      if (args->no_dependents) {
 +              packet_buf_write(&req_buf, "done");
 +              ret = 1;
 +      } else {
 +              /* Add all of the common commits we've found in previous rounds */
 +              add_common(&req_buf, common);
 +
 +              /* Add initial haves */
 +              ret = add_haves(&req_buf, haves_to_send, in_vain);
 +      }
 +
 +      /* Send request */
 +      packet_buf_flush(&req_buf);
 +      write_or_die(fd_out, req_buf.buf, req_buf.len);
 +
 +      strbuf_release(&req_buf);
 +      return ret;
 +}
 +
 +/*
 + * Processes a section header in a server's response and checks if it matches
 + * `section`.  If the value of `peek` is 1, the header line will be peeked (and
 + * not consumed); if 0, the line will be consumed and the function will die if
 + * the section header doesn't match what was expected.
 + */
 +static int process_section_header(struct packet_reader *reader,
 +                                const char *section, int peek)
 +{
 +      int ret;
 +
 +      if (packet_reader_peek(reader) != PACKET_READ_NORMAL)
 +              die("error reading section header '%s'", section);
 +
 +      ret = !strcmp(reader->line, section);
 +
 +      if (!peek) {
 +              if (!ret)
 +                      die("expected '%s', received '%s'",
 +                          section, reader->line);
 +              packet_reader_read(reader);
 +      }
 +
 +      return ret;
 +}
 +
 +static int process_acks(struct packet_reader *reader, struct oidset *common)
 +{
 +      /* received */
 +      int received_ready = 0;
 +      int received_ack = 0;
 +
 +      process_section_header(reader, "acknowledgments", 0);
 +      while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
 +              const char *arg;
 +
 +              if (!strcmp(reader->line, "NAK"))
 +                      continue;
 +
 +              if (skip_prefix(reader->line, "ACK ", &arg)) {
 +                      struct object_id oid;
 +                      if (!get_oid_hex(arg, &oid)) {
 +                              struct commit *commit;
 +                              oidset_insert(common, &oid);
 +                              commit = lookup_commit(&oid);
 +                              mark_common(commit, 0, 1);
 +                      }
 +                      continue;
 +              }
 +
 +              if (!strcmp(reader->line, "ready")) {
 +                      clear_prio_queue(&rev_list);
 +                      received_ready = 1;
 +                      continue;
 +              }
 +
 +              die("unexpected acknowledgment line: '%s'", reader->line);
 +      }
 +
 +      if (reader->status != PACKET_READ_FLUSH &&
 +          reader->status != PACKET_READ_DELIM)
 +              die("error processing acks: %d", reader->status);
 +
 +      /* return 0 if no common, 1 if there are common, or 2 if ready */
 +      return received_ready ? 2 : (received_ack ? 1 : 0);
 +}
 +
 +static void receive_shallow_info(struct fetch_pack_args *args,
 +                               struct packet_reader *reader)
 +{
 +      process_section_header(reader, "shallow-info", 0);
 +      while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
 +              const char *arg;
 +              struct object_id oid;
 +
 +              if (skip_prefix(reader->line, "shallow ", &arg)) {
 +                      if (get_oid_hex(arg, &oid))
 +                              die(_("invalid shallow line: %s"), reader->line);
 +                      register_shallow(&oid);
 +                      continue;
 +              }
 +              if (skip_prefix(reader->line, "unshallow ", &arg)) {
 +                      if (get_oid_hex(arg, &oid))
 +                              die(_("invalid unshallow line: %s"), reader->line);
 +                      if (!lookup_object(oid.hash))
 +                              die(_("object not found: %s"), reader->line);
 +                      /* make sure that it is parsed as shallow */
 +                      if (!parse_object(&oid))
 +                              die(_("error in object: %s"), reader->line);
 +                      if (unregister_shallow(&oid))
 +                              die(_("no shallow found: %s"), reader->line);
 +                      continue;
 +              }
 +              die(_("expected shallow/unshallow, got %s"), reader->line);
 +      }
 +
 +      if (reader->status != PACKET_READ_FLUSH &&
 +          reader->status != PACKET_READ_DELIM)
 +              die("error processing shallow info: %d", reader->status);
 +
 +      setup_alternate_shallow(&shallow_lock, &alternate_shallow_file, NULL);
 +      args->deepen = 1;
 +}
 +
 +enum fetch_state {
 +      FETCH_CHECK_LOCAL = 0,
 +      FETCH_SEND_REQUEST,
 +      FETCH_PROCESS_ACKS,
 +      FETCH_GET_PACK,
 +      FETCH_DONE,
 +};
 +
 +static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
 +                                  int fd[2],
 +                                  const struct ref *orig_ref,
 +                                  struct ref **sought, int nr_sought,
 +                                  char **pack_lockfile)
 +{
 +      struct ref *ref = copy_ref_list(orig_ref);
 +      enum fetch_state state = FETCH_CHECK_LOCAL;
 +      struct oidset common = OIDSET_INIT;
 +      struct packet_reader reader;
 +      int in_vain = 0;
 +      int haves_to_send = INITIAL_FLUSH;
 +      packet_reader_init(&reader, fd[0], NULL, 0,
 +                         PACKET_READ_CHOMP_NEWLINE);
 +
 +      while (state != FETCH_DONE) {
 +              switch (state) {
 +              case FETCH_CHECK_LOCAL:
 +                      sort_ref_list(&ref, ref_compare_name);
 +                      QSORT(sought, nr_sought, cmp_ref_by_name);
 +
 +                      /* v2 supports these by default */
 +                      allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
 +                      use_sideband = 2;
 +                      if (args->depth > 0 || args->deepen_since || args->deepen_not)
 +                              args->deepen = 1;
 +
 +                      if (marked)
 +                              for_each_ref(clear_marks, NULL);
 +                      marked = 1;
 +
 +                      for_each_ref(rev_list_insert_ref_oid, NULL);
 +                      for_each_cached_alternate(insert_one_alternate_object);
 +
 +                      /* Filter 'ref' by 'sought' and those that aren't local */
 +                      if (everything_local(args, &ref, sought, nr_sought))
 +                              state = FETCH_DONE;
 +                      else
 +                              state = FETCH_SEND_REQUEST;
 +                      break;
 +              case FETCH_SEND_REQUEST:
 +                      if (send_fetch_request(fd[1], args, ref, &common,
 +                                             &haves_to_send, &in_vain))
 +                              state = FETCH_GET_PACK;
 +                      else
 +                              state = FETCH_PROCESS_ACKS;
 +                      break;
 +              case FETCH_PROCESS_ACKS:
 +                      /* Process ACKs/NAKs */
 +                      switch (process_acks(&reader, &common)) {
 +                      case 2:
 +                              state = FETCH_GET_PACK;
 +                              break;
 +                      case 1:
 +                              in_vain = 0;
 +                              /* fallthrough */
 +                      default:
 +                              state = FETCH_SEND_REQUEST;
 +                              break;
 +                      }
 +                      break;
 +              case FETCH_GET_PACK:
 +                      /* Check for shallow-info section */
 +                      if (process_section_header(&reader, "shallow-info", 1))
 +                              receive_shallow_info(args, &reader);
 +
 +                      /* get the pack */
 +                      process_section_header(&reader, "packfile", 0);
 +                      if (get_pack(args, fd, pack_lockfile))
 +                              die(_("git fetch-pack: fetch failed."));
 +
 +                      state = FETCH_DONE;
 +                      break;
 +              case FETCH_DONE:
 +                      continue;
 +              }
 +      }
 +
 +      oidset_clear(&common);
 +      return ref;
 +}
 +
  static void fetch_pack_config(void)
  {
        git_config_get_int("fetch.unpacklimit", &fetch_unpack_limit);
@@@ -1473,7 -977,7 +1473,7 @@@ static void update_shallow(struct fetch
                           struct ref **sought, int nr_sought,
                           struct shallow_info *si)
  {
 -      struct sha1_array ref = SHA1_ARRAY_INIT;
 +      struct oid_array ref = OID_ARRAY_INIT;
        int *status;
        int i;
  
                 * shallow points that exist in the pack (iow in repo
                 * after get_pack() and reprepare_packed_git())
                 */
 -              struct sha1_array extra = SHA1_ARRAY_INIT;
 -              unsigned char (*sha1)[20] = si->shallow->sha1;
 +              struct oid_array extra = OID_ARRAY_INIT;
 +              struct object_id *oid = si->shallow->oid;
                for (i = 0; i < si->shallow->nr; i++)
 -                      if (has_sha1_file(sha1[i]))
 -                              sha1_array_append(&extra, sha1[i]);
 +                      if (has_object_file(&oid[i]))
 +                              oid_array_append(&extra, &oid[i]);
                if (extra.nr) {
                        setup_alternate_shallow(&shallow_lock,
                                                &alternate_shallow_file,
                                                &extra);
                        commit_lock_file(&shallow_lock);
                }
 -              sha1_array_clear(&extra);
 +              oid_array_clear(&extra);
                return;
        }
  
        if (!si->nr_ours && !si->nr_theirs)
                return;
        for (i = 0; i < nr_sought; i++)
 -              sha1_array_append(&ref, sought[i]->old_oid.hash);
 +              oid_array_append(&ref, &sought[i]->old_oid);
        si->ref = &ref;
  
        if (args->update_shallow) {
                 * shallow roots that are actually reachable from new
                 * refs.
                 */
 -              struct sha1_array extra = SHA1_ARRAY_INIT;
 -              unsigned char (*sha1)[20] = si->shallow->sha1;
 +              struct oid_array extra = OID_ARRAY_INIT;
 +              struct object_id *oid = si->shallow->oid;
                assign_shallow_commits_to_refs(si, NULL, NULL);
                if (!si->nr_ours && !si->nr_theirs) {
 -                      sha1_array_clear(&ref);
 +                      oid_array_clear(&ref);
                        return;
                }
                for (i = 0; i < si->nr_ours; i++)
 -                      sha1_array_append(&extra, sha1[si->ours[i]]);
 +                      oid_array_append(&extra, &oid[si->ours[i]]);
                for (i = 0; i < si->nr_theirs; i++)
 -                      sha1_array_append(&extra, sha1[si->theirs[i]]);
 +                      oid_array_append(&extra, &oid[si->theirs[i]]);
                setup_alternate_shallow(&shallow_lock,
                                        &alternate_shallow_file,
                                        &extra);
                commit_lock_file(&shallow_lock);
 -              sha1_array_clear(&extra);
 -              sha1_array_clear(&ref);
 +              oid_array_clear(&extra);
 +              oid_array_clear(&ref);
                return;
        }
  
                                sought[i]->status = REF_STATUS_REJECT_SHALLOW;
        }
        free(status);
 -      sha1_array_clear(&ref);
 +      oid_array_clear(&ref);
  }
  
  struct ref *fetch_pack(struct fetch_pack_args *args,
                       const struct ref *ref,
                       const char *dest,
                       struct ref **sought, int nr_sought,
 -                     struct sha1_array *shallow,
 -                     char **pack_lockfile)
 +                     struct oid_array *shallow,
 +                     char **pack_lockfile,
 +                     enum protocol_version version)
  {
        struct ref *ref_cpy;
        struct shallow_info si;
                die(_("no matching remote head"));
        }
        prepare_shallow_info(&si, shallow);
 -      ref_cpy = do_fetch_pack(args, fd, ref, sought, nr_sought,
 -                              &si, pack_lockfile);
 -      reprepare_packed_git();
 +      if (version == protocol_v2)
 +              ref_cpy = do_fetch_pack_v2(args, fd, ref, sought, nr_sought,
 +                                         pack_lockfile);
 +      else
 +              ref_cpy = do_fetch_pack(args, fd, ref, sought, nr_sought,
 +                                      &si, pack_lockfile);
 +      reprepare_packed_git(the_repository);
        update_shallow(args, sought, nr_sought, &si);
        clear_shallow_info(&si);
        return ref_cpy;
  }
 +
 +int report_unmatched_refs(struct ref **sought, int nr_sought)
 +{
 +      int i, ret = 0;
 +
 +      for (i = 0; i < nr_sought; i++) {
 +              if (!sought[i])
 +                      continue;
 +              switch (sought[i]->match_status) {
 +              case REF_MATCHED:
 +                      continue;
 +              case REF_NOT_MATCHED:
 +                      error(_("no such remote ref %s"), sought[i]->name);
 +                      break;
 +              case REF_UNADVERTISED_NOT_ALLOWED:
 +                      error(_("Server does not allow request for unadvertised object %s"),
 +                            sought[i]->name);
 +                      break;
 +              }
 +              ret = 1;
 +      }
 +      return ret;
 +}
diff --combined t/t5500-fetch-pack.sh
index 8390c0a2d224b129081a8e70fc5c0b3b2743d1ed,5879ee44d759dc4ab6b58b9c5b1f334ecb1f115e..ea6570e81990d73dc07d03c3bb6e6af5c8f029f4
@@@ -30,7 -30,7 +30,7 @@@ add () 
        test_tick &&
        commit=$(echo "$text" | git commit-tree $tree $parents) &&
        eval "$name=$commit; export $name" &&
 -      echo $commit > .git/refs/heads/$branch &&
 +      git update-ref "refs/heads/$branch" "$commit" &&
        eval ${branch}TIP=$commit
  }
  
@@@ -45,10 -45,10 +45,10 @@@ pull_to_client () 
  
                        case "$heads" in
                            *A*)
 -                                  echo $ATIP > .git/refs/heads/A;;
 +                                  git update-ref refs/heads/A "$ATIP";;
                        esac &&
                        case "$heads" in *B*)
 -                          echo $BTIP > .git/refs/heads/B;;
 +                          git update-ref refs/heads/B "$BTIP";;
                        esac &&
                        git symbolic-ref HEAD refs/heads/$(echo $heads \
                                | sed -e "s/^\(.\).*$/\1/") &&
@@@ -92,8 -92,8 +92,8 @@@ test_expect_success 'setup' 
                cur=$(($cur+1))
        done &&
        add B1 $A1 &&
 -      echo $ATIP > .git/refs/heads/A &&
 -      echo $BTIP > .git/refs/heads/B &&
 +      git update-ref refs/heads/A "$ATIP" &&
 +      git update-ref refs/heads/B "$BTIP" &&
        git symbolic-ref HEAD refs/heads/B
  '
  
@@@ -482,25 -482,25 +482,25 @@@ test_expect_success 'set up tests of mi
  test_expect_success 'test lonely missing ref' '
        (
                cd client &&
 -              test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy
 -      ) >/dev/null 2>error-m &&
 -      test_cmp expect-error error-m
 +              test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy 2>../error-m
 +      ) &&
 +      test_i18ncmp expect-error error-m
  '
  
  test_expect_success 'test missing ref after existing' '
        (
                cd client &&
 -              test_must_fail git fetch-pack --no-progress .. refs/heads/A refs/heads/xyzzy
 -      ) >/dev/null 2>error-em &&
 -      test_cmp expect-error error-em
 +              test_must_fail git fetch-pack --no-progress .. refs/heads/A refs/heads/xyzzy 2>../error-em
 +      ) &&
 +      test_i18ncmp expect-error error-em
  '
  
  test_expect_success 'test missing ref before existing' '
        (
                cd client &&
 -              test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy refs/heads/A
 -      ) >/dev/null 2>error-me &&
 -      test_cmp expect-error error-me
 +              test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy refs/heads/A 2>../error-me
 +      ) &&
 +      test_i18ncmp expect-error error-me
  '
  
  test_expect_success 'test --all, --depth, and explicit head' '
@@@ -518,6 -518,47 +518,47 @@@ test_expect_success 'test --all, --dept
        ) >out-adt 2>error-adt
  '
  
+ test_expect_success 'test --all with tag to non-tip' '
+       git commit --allow-empty -m non-tip &&
+       git commit --allow-empty -m tip &&
+       git tag -m "annotated" non-tip HEAD^ &&
+       (
+               cd client &&
+               git fetch-pack --all ..
+       )
+ '
+ test_expect_success 'test --all wrt tag to non-commits' '
+       # create tag-to-{blob,tree,commit,tag}, making sure all tagged objects
+       # are reachable only via created tag references.
+       blob=$(echo "hello blob" | git hash-object -t blob -w --stdin) &&
+       git tag -a -m "tag -> blob" tag-to-blob $blob &&
+  \
+       tree=$(printf "100644 blob $blob\tfile" | git mktree) &&
+       git tag -a -m "tag -> tree" tag-to-tree $tree &&
+  \
+       tree2=$(printf "100644 blob $blob\tfile2" | git mktree) &&
+       commit=$(git commit-tree -m "hello commit" $tree) &&
+       git tag -a -m "tag -> commit" tag-to-commit $commit &&
+  \
+       blob2=$(echo "hello blob2" | git hash-object -t blob -w --stdin) &&
+       tag=$(printf "object $blob2\ntype blob\ntag tag-to-blob2\n\
+ tagger author A U Thor <author@example.com> 0 +0000\n\nhello tag" | git mktag) &&
+       git tag -a -m "tag -> tag" tag-to-tag $tag &&
+  \
+       # `fetch-pack --all` should succeed fetching all those objects.
+       mkdir fetchall &&
+       (
+               cd fetchall &&
+               git init &&
+               git fetch-pack --all .. &&
+               git cat-file blob $blob >/dev/null &&
+               git cat-file tree $tree >/dev/null &&
+               git cat-file commit $commit >/dev/null &&
+               git cat-file tag $tag >/dev/null
+       )
+ '
  test_expect_success 'shallow fetch with tags does not break the repository' '
        mkdir repo1 &&
        (
@@@ -547,41 -588,6 +588,41 @@@ test_expect_success 'fetch-pack can fet
        git fetch-pack hidden $(git -C hidden rev-parse refs/hidden/one)
  '
  
 +test_expect_success 'fetch-pack can fetch a raw sha1 that is advertised as a ref' '
 +      rm -rf server client &&
 +      git init server &&
 +      test_commit -C server 1 &&
 +
 +      git init client &&
 +      git -C client fetch-pack ../server \
 +              $(git -C server rev-parse refs/heads/master)
 +'
 +
 +test_expect_success 'fetch-pack can fetch a raw sha1 overlapping a named ref' '
 +      rm -rf server client &&
 +      git init server &&
 +      test_commit -C server 1 &&
 +      test_commit -C server 2 &&
 +
 +      git init client &&
 +      git -C client fetch-pack ../server \
 +              $(git -C server rev-parse refs/tags/1) refs/tags/1
 +'
 +
 +test_expect_success 'fetch-pack cannot fetch a raw sha1 that is not advertised as a ref' '
 +      rm -rf server &&
 +
 +      git init server &&
 +      test_commit -C server 5 &&
 +      git -C server tag -d 5 &&
 +      test_commit -C server 6 &&
 +
 +      git init client &&
 +      test_must_fail git -C client fetch-pack ../server \
 +              $(git -C server rev-parse refs/heads/master^) 2>err &&
 +      test_i18ngrep "Server does not allow request for unadvertised object" err
 +'
 +
  check_prot_path () {
        cat >expected <<-EOF &&
        Diag: url=$1
@@@ -711,17 -717,6 +752,17 @@@ test_expect_success 'fetch shallow sinc
        test_cmp expected actual
  '
  
 +test_expect_success 'clone shallow since selects no commits' '
 +      test_create_repo shallow-since-the-future &&
 +      (
 +      cd shallow-since-the-future &&
 +      GIT_COMMITTER_DATE="100000000 +0700" git commit --allow-empty -m one &&
 +      GIT_COMMITTER_DATE="200000000 +0700" git commit --allow-empty -m two &&
 +      GIT_COMMITTER_DATE="300000000 +0700" git commit --allow-empty -m three &&
 +      test_must_fail git clone --shallow-since "900000000 +0700" "file://$(pwd)/." ../shallow111
 +      )
 +'
 +
  test_expect_success 'shallow clone exclude tag two' '
        test_create_repo shallow-exclude &&
        (
@@@ -766,67 -761,4 +807,67 @@@ test_expect_success 'fetching deepen' 
        )
  '
  
 +test_expect_success 'filtering by size' '
 +      rm -rf server client &&
 +      test_create_repo server &&
 +      test_commit -C server one &&
 +      test_config -C server uploadpack.allowfilter 1 &&
 +
 +      test_create_repo client &&
 +      git -C client fetch-pack --filter=blob:limit=0 ../server HEAD &&
 +
 +      # Ensure that object is not inadvertently fetched
 +      test_must_fail git -C client cat-file -e $(git hash-object server/one.t)
 +'
 +
 +test_expect_success 'filtering by size has no effect if support for it is not advertised' '
 +      rm -rf server client &&
 +      test_create_repo server &&
 +      test_commit -C server one &&
 +
 +      test_create_repo client &&
 +      git -C client fetch-pack --filter=blob:limit=0 ../server HEAD 2> err &&
 +
 +      # Ensure that object is fetched
 +      git -C client cat-file -e $(git hash-object server/one.t) &&
 +
 +      test_i18ngrep "filtering not recognized by server" err
 +'
 +
 +fetch_filter_blob_limit_zero () {
 +      SERVER="$1"
 +      URL="$2"
 +
 +      rm -rf "$SERVER" client &&
 +      test_create_repo "$SERVER" &&
 +      test_commit -C "$SERVER" one &&
 +      test_config -C "$SERVER" uploadpack.allowfilter 1 &&
 +
 +      git clone "$URL" client &&
 +      test_config -C client extensions.partialclone origin &&
 +
 +      test_commit -C "$SERVER" two &&
 +
 +      git -C client fetch --filter=blob:limit=0 origin HEAD:somewhere &&
 +
 +      # Ensure that commit is fetched, but blob is not
 +      test_config -C client extensions.partialclone "arbitrary string" &&
 +      git -C client cat-file -e $(git -C "$SERVER" rev-parse two) &&
 +      test_must_fail git -C client cat-file -e $(git hash-object "$SERVER/two.t")
 +}
 +
 +test_expect_success 'fetch with --filter=blob:limit=0' '
 +      fetch_filter_blob_limit_zero server server
 +'
 +
 +. "$TEST_DIRECTORY"/lib-httpd.sh
 +start_httpd
 +
 +test_expect_success 'fetch with --filter=blob:limit=0 and HTTP' '
 +      fetch_filter_blob_limit_zero "$HTTPD_DOCUMENT_ROOT_PATH/server" "$HTTPD_URL/smart/server"
 +'
 +
 +stop_httpd
 +
 +
  test_done