diffcore-break: don't divide by zero
When the source file is empty, the calculation of the merge score results in a division by zero. In the situation: == preimage == == postimage == F (empty file) F (a large file) E (a new empty file) it does not make sense to consider F->E as a rename, so it is better not to break the pre- and post-image of F. Bail out early in this case to avoid hitting the divide-by-zero. This causes the merge score to be left at zero. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Keeping committed
Apr 3, 2013 at 20:24 UTC
e7b00c57640fa2bf11e4218b588f51cc5a9a754e
1 file changed
+3
diffcore-break.c
+3
@@ -68,6 +68,9 @@ static int should_break(struct diff_filespec *src,
68
if (max_size < MINIMUM_BREAK_SIZE)
69
return 0; /* we do not break too small filepair */
70
71
+ if (!src->size)
72
+ return 0; /* we do not let empty files get renamed */
73
+
74
if (diffcore_count_changes(src, dst,
75
&src->cnt_data, &dst->cnt_data,
76
0,