diff options
| author | Nicolas Pitre <nico@fluxnic.net> | 2010-02-17 19:05:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-17 19:08:44 (GMT) |
| commit | b500d5e11ea67d29dd7be622f65571d611d6e9a3 (patch) | |
| tree | acd3a4b4885a6b697644bdf7a5bc100081d64ad9 /fast-import.c | |
| parent | 8c2ca8dd8a5d6d8beaa0a4abed0c135004eef772 (diff) | |
| download | git-b500d5e11ea67d29dd7be622f65571d611d6e9a3.zip git-b500d5e11ea67d29dd7be622f65571d611d6e9a3.tar.gz git-b500d5e11ea67d29dd7be622f65571d611d6e9a3.tar.bz2 | |
fast-import: use the diff_delta() max_delta_size argument
This let diff_delta() abort early if it is going to bust the given
size limit. Also, only objects larger than 20 bytes are considered
as objects smaller than that are most certainly going to produce
larger deltas than the original object due to the additional headers.
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fast-import.c b/fast-import.c index 7fc9862..74f08bd 100644 --- 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; |