Merge branch 'maint'

[git.git] / fast-import.c

diff --git a/fast-import.c b/fast-import.c
index 7fc98620b2f712c56b0a20a0b1508c4233f80801..74f08bd554ae4cab1dc9ee38272376e5cbec1200 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -1041,14 +1041,10 @@ static int store_object(
                return 1;
        }
 
-       if (last && last->data.buf && last->depth < max_depth) {
+       if (last && last->data.buf && last->depth < max_depth && dat->len > 20) {
                delta = diff_delta(last->data.buf, last->data.len,
                        dat->buf, dat->len,
-                       &deltalen, 0);
-               if (delta && deltalen >= dat->len) {
-                       free(delta);
-                       delta = NULL;
-               }
+                       &deltalen, dat->len - 20);
        } else
                delta = NULL;