diffcore-break: do not break too small filepair.
Somehow we checked only one side and not the other. By checking
the filesize upfront, we can bypass generating delta
unnecessarily.
Signed-off-by: Junio C Hamano <junkio@cox.net>
diff --git a/diffcore-break.c b/diffcore-break.c
index e6a468e..c57513a 100644
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -62,6 +62,8 @@
return 0; /* error but caught downstream */
base_size = ((src->size < dst->size) ? src->size : dst->size);
+ if (base_size < MINIMUM_BREAK_SIZE)
+ return 0; /* we do not break too small filepair */
delta = diff_delta(src->data, src->size,
dst->data, dst->size,
@@ -170,8 +172,7 @@
!S_ISDIR(p->one->mode) && !S_ISDIR(p->two->mode) &&
!strcmp(p->one->path, p->two->path)) {
if (should_break(p->one, p->two,
- break_score, &score) &&
- MINIMUM_BREAK_SIZE <= p->one->size) {
+ break_score, &score)) {
/* Split this into delete and create */
struct diff_filespec *null_one, *null_two;
struct diff_filepair *dp;
