Fix delta "sliding window" code

When Junio fixed the lack of a successful error code from try_delta(),
that uncovered an off-by-one error in the caller.

Also, some testing made it clear that we now find a lot more deltas,
because we used to (incorrectly) break early on bogus "failure"
cases.

diff --git a/pack-objects.c b/pack-objects.c
index 68c7e592b51b2174390bf9ab17e7dec7a9841d52..dfa9d44a15625d71a93418c2c5bd996441c79506 100644 (file)
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -344,11 +344,12 @@ static void find_deltas(struct object_entry **list, int window)
                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->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);

-               for (j = 0; j < window; j++) {
-                       unsigned int other_idx = idx - 1 - j;
+               j = window;
+               while (--j > 0) {
+                       unsigned int other_idx = idx + j;

                        struct unpacked *m;
                        struct unpacked *m;

-                       if (other_idx < 0)
-                               other_idx += window;
+                       if (other_idx >= window)
+                               other_idx -= window;

                        m = array + other_idx;
                        if (!m->entry)
                                break;
                        m = array + other_idx;
                        if (!m->entry)
                                break;