count-delta: fix counting of copied source.

Junio C Hamano · Junio C Hamano · commit c86e8568d87a · 2006-02-23T15:50:18.000-08:00
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 &lt;junkio@cox.net&gt;
diff --git 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;
 				}

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ static void touch_range(struct span **span,`
`26`	`26`	`again:`
`27`	`27`	`if (ofs < e->end) {`
`28`	`28`	`while (e->end < end) {`
`29`		`- if (e->next) {`
	`29`	`+ if (e->next && e->next->ofs <= end) {`
`30`	`30`	`e->end = e->next->ofs;`
`31`	`31`	`e = e->next;`
`32`	`32`	`}`