Merge branch 'mh/fast-import-no-diff-delta-empty'

gitster · gitster · commit fa6758e9afb7 · 2018-07-24T14:50:46.000-07:00
"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
@@ -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]++;

Original file line number	Diff line number	Diff line change
`@@ -1076,7 +1076,7 @@ static int store_object(`
`1076`	`1076`	`return 1;`
`1077`	`1077`	`}`
`1078`	`1078`
`1079`		`- if (last && last->data.buf && last->depth < max_depth`
	`1079`	`+ if (last && last->data.len && last->data.buf && last->depth < max_depth`
`1080`	`1080`	`&& dat->len > the_hash_algo->rawsz) {`
`1081`	`1081`
`1082`	`1082`	`delta_count_attempts_by_type[type]++;`