From: Junio C Hamano <junkio@cox.net>
Date: Thu, 23 Feb 2006 10:58:37 +0000 (-0800)
Subject: count-delta: fix counting of copied source.
X-Git-Tag: v1.3.0-rc1~54^2~22^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c86e8568d87aec483379f2cef0ab81580abd1af5;p=git.git

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>
---

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;
 				}