summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 907380e)
raw | patch | inline | side by side (parent: 907380e)
author | Junio C Hamano <junkio@cox.net> | |
Thu, 23 Feb 2006 10:58:37 +0000 (02:58 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Thu, 23 Feb 2006 23:50:18 +0000 (15:50 -0800) |
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>
even though the span being added does not reach it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
count-delta.c | patch | blob | history |
diff --git a/count-delta.c b/count-delta.c
index 4e4d2f4fcc7bcbdf3004972a79a8aabc6dd483df..3ee3a0ccf1b92f3f8838ca2e728bde9f60d1b8e8 100644 (file)
--- a/count-delta.c
+++ b/count-delta.c
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;
}