Merge branch 'np/pack'

* np/pack:
  improve depth heuristic for maximum delta size
  pack-object: slightly more efficient
  simple euristic for further free packing improvements

diff --combined pack-objects.c
index 0dbda2c,3375179..77284cf
--- 1/pack-objects.c
--- 2/pack-objects.c
+++ b/pack-objects.c
@@@ -10,6 -10,7 +10,6 @@@
  #include "tree-walk.h"
  #include <sys/time.h>
  #include <signal.h>
 -#include <stdint.h>
  
  static const char pack_usage[] = "git-pack-objects [-q] [--no-reuse-delta] [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list";
  
@@@ -156,7 -157,7 +156,7 @@@ static void prepare_pack_revindex(struc
  
        rix->revindex = xmalloc(sizeof(unsigned long) * (num_ent + 1));
        for (i = 0; i < num_ent; i++) {
 -              uint32_t hl = *((uint32_t *)(index + 24 * i));
 +              unsigned int hl = *((unsigned int *)(index + 24 * i));
                rix->revindex[i] = ntohl(hl);
        }
        /* This knows the pack format -- the 20-byte trailer
@@@ -1036,10 -1037,13 +1036,13 @@@ static int try_delta(struct unpacked *t
        if (src_entry->depth >= max_depth)
                return 0;
  
-       /* Now some size filtering euristics. */
+       /* Now some size filtering heuristics. */
        size = trg_entry->size;
-       max_size = size / 2 - 20;
-       if (trg_entry->delta)
+       max_size = size/2 - 20;
+       max_size = max_size * (max_depth - src_entry->depth) / max_depth;
+       if (max_size == 0)
+               return 0;
+       if (trg_entry->delta && trg_entry->delta_size <= max_size)
                max_size = trg_entry->delta_size-1;
        src_size = src_entry->size;
        sizediff = src_size < size ? size - src_size : 0;
@@@ -1104,17 -1108,14 +1107,14 @@@ static void find_deltas(struct object_e
  
                if (entry->size < 50)
                        continue;
-               if (n->index)
-                       free_delta_index(n->index);
+               free_delta_index(n->index);
+               n->index = NULL;
                free(n->data);
                n->entry = entry;
                n->data = read_sha1_file(entry->sha1, type, &size);
                if (size != entry->size)
                        die("object %s inconsistent object length (%lu vs %lu)",
                            sha1_to_hex(entry->sha1), size, entry->size);
-               n->index = create_delta_index(n->data, size);
-               if (!n->index)
-                       die("out of memory");
  
                j = window;
                while (--j > 0) {
@@@ -1128,15 -1129,17 +1128,17 @@@
                        if (try_delta(n, m, m->index, depth) < 0)
                                break;
                }
- #if 0
                /* if we made n a delta, and if n is already at max
                 * depth, leaving it in the window is pointless.  we
                 * should evict it first.
-                * ... in theory only; somehow this makes things worse.
                 */
                if (entry->delta && depth <= entry->depth)
                        continue;
- #endif
+ 
+               n->index = create_delta_index(n->data, size);
+               if (!n->index)
+                       die("out of memory");
+ 
                idx++;
                if (idx >= window)
                        idx = 0;
@@@ -1146,8 -1149,7 +1148,7 @@@
                fputc('\n', stderr);
  
        for (i = 0; i < window; ++i) {
-               if (array[i].index)
-                       free_delta_index(array[i].index);
+               free_delta_index(array[i].index);
                free(array[i].data);
        }
        free(array);