diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:46 -0700 |
| commit | fa6758e9afb7cbd211e38b6f81e9d21872d97338 (patch) | |
| tree | 245fcf91a641097541be6ee9e6b600e479ce8553 | |
| parent | Merge branch 'kn/userdiff-php' (diff) | |
| parent | fast-import: do not call diff_delta() with empty buffer (diff) | |
| download | tgif-fa6758e9afb7cbd211e38b6f81e9d21872d97338.tar.xz | |
Merge branch 'mh/fast-import-no-diff-delta-empty'
"git fast-import" has been updated to avoid attempting to create
delta against a zero-byte-long string, which is pointless.
* mh/fast-import-no-diff-delta-empty:
fast-import: do not call diff_delta() with empty buffer
| -rw-r--r-- | fast-import.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c index 4d55910ab9..12195d54d7 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1076,7 +1076,7 @@ static int store_object( return 1; } - if (last && last->data.buf && last->depth < max_depth + if (last && last->data.len && last->data.buf && last->depth < max_depth && dat->len > the_hash_algo->rawsz) { delta_count_attempts_by_type[type]++; |