diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-07 14:32:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-07 14:32:57 -0700 |
| commit | 8a2decfec6a0fd30fe0fdd3b00655b60e6e01274 (patch) | |
| tree | 9da3cd9396e7ccf3154025461bd9550eb0115966 | |
| parent | Merge branch 'jk/bisect-prn-unsigned' (diff) | |
| parent | diffcore-break: don't divide by zero (diff) | |
| download | tgif-8a2decfec6a0fd30fe0fdd3b00655b60e6e01274.tar.xz | |
Merge branch 'jk/diffcore-break-divzero'
* jk/diffcore-break-divzero:
diffcore-break: don't divide by zero
| -rw-r--r-- | diffcore-break.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/diffcore-break.c b/diffcore-break.c index 44f8678d22..1d9e530a84 100644 --- 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, |