diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2013-07-23 10:28:06 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-23 12:09:14 -0700 |
| commit | f8395edc6f5c59a92adcf42ea20a01872ec22700 (patch) | |
| tree | a7fda097a9751a69ee566ef3a25db1cf0c20bc25 | |
| parent | 99780b0a4ab22c903516601bb3634e6477d7f1c1 (diff) | |
| download | git-f8395edc6f5c59a92adcf42ea20a01872ec22700.tar.gz | |
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>
| -rw-r--r-- | line-log.c | 2 | ||||
| -rwxr-xr-x | t/t4211-line-log.sh | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/line-log.c b/line-log.c index 52348796c1..6f94d56063 100644 --- a/line-log.c +++ b/line-log.c @@ -115,6 +115,8 @@ static void sort_and_merge_range_set(struct range_set *rs) qsort(rs->ranges, rs->nr, sizeof(struct range), range_cmp); for (i = 0; i < rs->nr; i++) { + if (rs->ranges[i].start == rs->ranges[i].end) + continue; if (o > 0 && rs->ranges[i].start <= rs->ranges[o-1].end) { if (rs->ranges[o-1].end < rs->ranges[i].end) rs->ranges[o-1].end = rs->ranges[i].end; diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh index d98efb3c4e..e7a6e49965 100755 --- a/t/t4211-line-log.sh +++ b/t/t4211-line-log.sh @@ -67,7 +67,8 @@ test_bad_opts "-L :foo:b.c" "no match" # There is a separate bug when an empty -L range is the first -L encountered, # thus to demonstrate this particular bug, the empty -L range must follow a # non-empty -L range. -test_expect_failure '-L {empty-range} (any -L)' ' +test_expect_success '-L {empty-range} (any -L)' ' + n=$(expr $(cat b.c | wc -l) + 1) && n=$(expr $(wc -l <b.c) + 1) && git log -L1,1:b.c -L$n:b.c ' |