range-set: satisfy non-empty ranges invariant
commitf8395edc6f5c59a92adcf42ea20a01872ec22700
authorEric Sunshine <sunshine@sunshineco.com>
Tue, 23 Jul 2013 14:28:06 +0000 (23 10:28 -0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Jul 2013 19:09:14 +0000 (23 12:09 -0700)
treea7fda097a9751a69ee566ef3a25db1cf0c20bc25
parent99780b0a4ab22c903516601bb3634e6477d7f1c1
range-set: satisfy non-empty ranges invariant

range-set invariants are: ranges must be (1) non-empty, (2) disjoint,
(3) sorted in ascending order.

During processing, various range-set utility functions break the
invariants (for instance, by adding empty ranges), with the
expectation that a finalizing sort_and_merge_range_set() will restore
sanity.

sort_and_merge_range_set(), however, neglects to fold out empty
ranges, thus it fails to satisfy the non-empty constraint. Subsequent
range-set functions crash or throw an assertion failure upon
encountering such an anomaly. Rectify the situation by having
sort_and_merge_range_set() fold out empty ranges.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Acked-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
line-log.c
t/t4211-line-log.sh