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

* jk/diffcore-break-divzero: diffcore-break: don't divide by zero
2013-04-12 13:41:47 -07:00 · 2013-04-12 13:41:47 -07:00 · 15af30e72f
parent 788e98f8c0 e7b00c5764
commit 15af30e72f
1 changed files with 3 additions and 0 deletions
--- 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,