Merge branch 'mh/fast-import-no-diff-delta-empty'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2018 21:50:46 +0000 (14:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2018 21:50:46 +0000 (14:50 -0700)
"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

fast-import.c
index 4d55910ab9a0634a553c01643035ef9afe6034c7..12195d54d744f60c0a4e1074814559325e42085e 100644 (file)
@@ -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]++;