From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Jul 2018 21:50:46 +0000 (-0700)
Subject: Merge branch 'mh/fast-import-no-diff-delta-empty'
X-Git-Tag: v2.19.0-rc0~133
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fa6758e9afb7cbd211e38b6f81e9d21872d97338?hp=d3f09389731e186a978f095228431b1bb293b6f6

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
---

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]++;