Merge branch 'jc/diff' into next

diff --git a/pack-objects.c b/pack-objects.c
index 18f8f82571f82e9618b87797065be36b7087ce74..c0acc460bb9df0313e314eb2cf48363b2458082c 100644 (file)
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -8,8 +8,6 @@
 #include "pack.h"
 #include "csum-file.h"
 #include "tree-walk.h"
-#include "rabinpoly.h"
-#include "gsimm.h"
 #include <sys/time.h>
 #include <signal.h>
 
@@ -995,7 +993,6 @@ static int type_size_sort(const struct object_entry *a, const struct object_entr
 
 struct unpacked {
        struct object_entry *entry;
-       unsigned char fingerprint[MD_LENGTH];
        void *data;
 };
 
@@ -1044,9 +1041,6 @@ static int try_delta(struct unpacked *cur, struct unpacked *old, unsigned max_de
        if (old_entry->depth >= max_depth)
                return 0;
 
-       if (gb_simm_score(cur->fingerprint, old->fingerprint) < 0.4)
-               return 0;
-
        /*
         * NOTE!
         *
@@ -1058,7 +1052,7 @@ static int try_delta(struct unpacked *cur, struct unpacked *old, unsigned max_de
        if (cur_entry->delta)
                max_size = cur_entry->delta_size-1;
        if (sizediff >= max_size)
-               return -1;
+               return 0;
        delta_buf = diff_delta(old->data, oldsize,
                               cur->data, size, &delta_size, max_size);
        if (!delta_buf)
@@ -1083,7 +1077,6 @@ static void find_deltas(struct object_entry **list, int window, int depth)
        unsigned processed = 0;
        unsigned last_percent = 999;
 
-       rabin_reset ();
        memset(array, 0, array_size);
        i = nr_objects;
        idx = 0;
@@ -1122,8 +1115,6 @@ static void find_deltas(struct object_entry **list, int window, int depth)
                if (size != entry->size)
                        die("object %s inconsistent object length (%lu vs %lu)", sha1_to_hex(entry->sha1), size, entry->size);
 
-               gb_simm_process(n->data, size, n->fingerprint);
-
                j = window;
                while (--j > 0) {
                        unsigned int other_idx = idx + j;
@@ -1133,7 +1124,6 @@ static void find_deltas(struct object_entry **list, int window, int depth)
                        m = array + other_idx;
                        if (!m->entry)
                                break;
-
                        if (try_delta(n, m, depth) < 0)
                                break;
                }
@@ -1241,7 +1231,7 @@ static void setup_progress_signal(void)
 int main(int argc, char **argv)
 {
        SHA_CTX ctx;
-       char line[PATH_MAX + 20];
+       char line[40 + 1 + PATH_MAX + 2];
        int window = 10, depth = 10, pack_to_stdout = 0;
        struct object_entry **list;
        int num_preferred_base = 0;