aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--diffcore-break.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/diffcore-break.c b/diffcore-break.c
index 06f9a7f0e..e6a468e6b 100644
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -66,6 +66,8 @@ static int should_break(struct diff_filespec *src,
delta = diff_delta(src->data, src->size,
dst->data, dst->size,
&delta_size, 0);
+ if (!delta)
+ return 0; /* error but caught downstream */
/* Estimate the edit size by interpreting delta. */
if (count_delta(delta, delta_size,