| commit | e7b00c57640fa2bf11e4218b588f51cc5a9a754e | |
| author | John Keeping <john@keeping.me.uk> | |
| Wed, 3 Apr 2013 19:24:05 +0000 (3 20:24 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Apr 2013 19:48:02 +0000 (3 12:48 -0700) | ||
| tree | f0d0b2ae827986d72de436e0cc48c7d83f6a3213 | treesnapshot (tar.gz zip) |
| parent | 15999998fbda60552742275570947431b57108ae | commitdiff |
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>
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>
| diffcore-break.c | diffblobblamehistory |