Merge branch 'jc/send-insane-refs' into next

* jc/send-insane-refs:
  send-pack: do not give up when remote has insanely large number of refs.
  rev-list.c: fix non-grammatical comments.

diff --combined rev-list.c
index 373549e,ee5f15a..1589400
--- 1/rev-list.c
--- 2/rev-list.c
+++ b/rev-list.c
@@@ -30,7 -30,7 +30,7 @@@ static const char rev_list_usage[] 
  "    --date-order\n"
  "  formatting output:\n"
  "    --parents\n"
 -"    --objects\n"
 +"    --objects | --objects-edge\n"
  "    --unpacked\n"
  "    --header | --pretty\n"
  "    --abbrev=nr | --no-abbrev\n"
@@@ -44,7 -44,6 +44,7 @@@ static int bisect_list = 0
  static int tag_objects = 0;
  static int tree_objects = 0;
  static int blob_objects = 0;
 +static int edge_hint = 0;
  static int verbose_header = 0;
  static int abbrev = DEFAULT_ABBREV;
  static int show_parents = 0;
@@@ -256,8 -255,8 +256,8 @@@ static void show_commit_list(struct com
                die("unknown pending object %s (%s)", sha1_to_hex(obj->sha1), name);
        }
        while (objects) {
-               /* An object with name "foo\n0000000000000000000000000000000000000000"
-                * can be used confuse downstream git-pack-objects very badly.
+               /* An object with name "foo\n0000000..." can be used to
+                * confuse downstream git-pack-objects very badly.
                 */
                const char *ep = strchr(objects->name, '\n');
                if (ep) {
@@@ -431,30 -430,16 +431,30 @@@ static struct commit_list *find_bisecti
        return best;
  }
  
 +static void mark_edge_parents_uninteresting(struct commit *commit)
 +{
 +      struct commit_list *parents;
 +
 +      for (parents = commit->parents; parents; parents = parents->next) {
 +              struct commit *parent = parents->item;
 +              if (!(parent->object.flags & UNINTERESTING))
 +                      continue;
 +              mark_tree_uninteresting(parent->tree);
 +              if (edge_hint)
 +                      printf("-%s\n", sha1_to_hex(parent->object.sha1));
 +      }
 +}
 +
  static void mark_edges_uninteresting(struct commit_list *list)
  {
        for ( ; list; list = list->next) {
 -              struct commit_list *parents = list->item->parents;
 +              struct commit *commit = list->item;
  
 -              for ( ; parents; parents = parents->next) {
 -                      struct commit *commit = parents->item;
 -                      if (commit->object.flags & UNINTERESTING)
 -                              mark_tree_uninteresting(commit->tree);
 +              if (commit->object.flags & UNINTERESTING) {
 +                      mark_tree_uninteresting(commit->tree);
 +                      continue;
                }
 +              mark_edge_parents_uninteresting(commit);
        }
  }
  
@@@ -858,13 -843,6 +858,13 @@@ int main(int argc, const char **argv
                        blob_objects = 1;
                        continue;
                }
 +              if (!strcmp(arg, "--objects-edge")) {
 +                      tag_objects = 1;
 +                      tree_objects = 1;
 +                      blob_objects = 1;
 +                      edge_hint = 1;
 +                      continue;
 +              }
                if (!strcmp(arg, "--unpacked")) {
                        unpacked = 1;
                        limited = 1;

diff --combined send-pack.c
index ad22da5,b58bbab..f558386
--- 1/send-pack.c
--- 2/send-pack.c
+++ b/send-pack.c
@@@ -12,7 -12,6 +12,7 @@@ static const char *exec = "git-receive-
  static int verbose = 0;
  static int send_all = 0;
  static int force_update = 0;
 +static int use_thin_pack = 0;
  
  static int is_zero_sha1(const unsigned char *sha1)
  {
@@@ -38,29 -37,44 +38,47 @@@ static void exec_pack_objects(void
  
  static void exec_rev_list(struct ref *refs)
  {
+       struct ref *ref;
        static char *args[1000];
-       int i = 0;
+       int i = 0, j;
  
        args[i++] = "rev-list"; /* 0 */
 -      args[i++] = "--objects";        /* 1 */
 +      if (use_thin_pack)      /* 1 */
 +              args[i++] = "--objects-edge";
 +      else
 +              args[i++] = "--objects";
-       while (refs) {
-               char *buf = malloc(100);
-               if (i > 900)
+ 
+       /* First send the ones we care about most */
+       for (ref = refs; ref; ref = ref->next) {
+               if (900 < i)
                        die("git-rev-list environment overflow");
-               if (!is_zero_sha1(refs->old_sha1) &&
-                   has_sha1_file(refs->old_sha1)) {
+               if (!is_zero_sha1(ref->new_sha1)) {
+                       char *buf = malloc(100);
                        args[i++] = buf;
-                       snprintf(buf, 50, "^%s", sha1_to_hex(refs->old_sha1));
+                       snprintf(buf, 50, "%s", sha1_to_hex(ref->new_sha1));
                        buf += 50;
+                       if (!is_zero_sha1(ref->old_sha1) &&
+                           has_sha1_file(ref->old_sha1)) {
+                               args[i++] = buf;
+                               snprintf(buf, 50, "^%s",
+                                        sha1_to_hex(ref->old_sha1));
+                       }
                }
-               if (!is_zero_sha1(refs->new_sha1)) {
+       }
+ 
+       /* Then a handful of the remainder
+        * NEEDSWORK: we would be better off if used the newer ones first.
+        */
+       for (ref = refs, j = i + 16;
+            i < 900 && i < j && ref;
+            ref = ref->next) {
+               if (is_zero_sha1(ref->new_sha1) &&
+                   !is_zero_sha1(ref->old_sha1) &&
+                   has_sha1_file(ref->old_sha1)) {
+                       char *buf = malloc(42);
                        args[i++] = buf;
-                       snprintf(buf, 50, "%s", sha1_to_hex(refs->new_sha1));
+                       snprintf(buf, 42, "^%s", sha1_to_hex(ref->old_sha1));
                }
-               refs = refs->next;
        }
        args[i] = NULL;
        execv_git_cmd(args);
@@@ -365,10 -379,6 +383,10 @@@ int main(int argc, char **argv
                                verbose = 1;
                                continue;
                        }
 +                      if (!strcmp(arg, "--thin")) {
 +                              use_thin_pack = 1;
 +                              continue;
 +                      }
                        usage(send_pack_usage);
                }
                if (!dest) {