Merge branch 'jk/diffcore-break-divzero' into maint

* jk/diffcore-break-divzero: diffcore-break: don't divide by zero
git-mirror · Apr 12, 2013 · 15af30e · 15af30e
2 parents 788e98f + e7b00c5
commit 15af30e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/diffcore-break.c b/diffcore-break.c
@@ -68,6 +68,9 @@ static int should_break(struct diff_filespec *src,
 	if (max_size < MINIMUM_BREAK_SIZE)
 		return 0; /* we do not break too small filepair */
 
+	if (!src->size)
+		return 0; /* we do not let empty files get renamed */
+
 	if (diffcore_count_changes(src, dst,
 				   &src->cnt_data, &dst->cnt_data,
 				   0,