diff options
author | Junio C Hamano <junkio@cox.net> | 2006-02-23 02:58:37 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-02-23 15:50:18 -0800 |
commit | c86e8568d87aec483379f2cef0ab81580abd1af5 (patch) | |
tree | 2f64ba3cf704a0cd98663c1cb53319a96ffd042d | |
parent | 907380eeff27e9a07d6f1c03847c3d80f9e0e79a (diff) | |
download | git-c86e8568d87aec483379f2cef0ab81580abd1af5.tar.gz git-c86e8568d87aec483379f2cef0ab81580abd1af5.tar.xz |
count-delta: fix counting of copied source.
The previous one wrongly coalesced a span with the next one
even though the span being added does not reach it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r-- | count-delta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/count-delta.c b/count-delta.c index 4e4d2f4fc..3ee3a0ccf 100644 --- a/count-delta.c +++ b/count-delta.c @@ -26,7 +26,7 @@ static void touch_range(struct span **span, again: if (ofs < e->end) { while (e->end < end) { - if (e->next) { + if (e->next && e->next->ofs <= end) { e->end = e->next->ofs; e = e->next; } |