diff options
author | John Keeping <john@keeping.me.uk> | 2013-04-03 20:24:05 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-03 12:48:02 -0700 |
commit | e7b00c57640fa2bf11e4218b588f51cc5a9a754e (patch) | |
tree | f0d0b2ae827986d72de436e0cc48c7d83f6a3213 /gitweb | |
parent | Git 1.8.0.3 (diff) | |
download | tgif-e7b00c57640fa2bf11e4218b588f51cc5a9a754e.tar.xz |
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>
Diffstat (limited to 'gitweb')
0 files changed, 0 insertions, 0 deletions