summaryrefslogtreecommitdiff
path: root/t/t4211/expect.multiple-superset
AgeCommit message (Collapse)AuthorFilesLines
2013-04-05log -L: fix overlapping input rangesLibravatar Thomas Rast1-0/+59
The existing code was too defensive, and would trigger the assert in range_set_append() if the user gave overlapping ranges. The intent was always to define overlapping ranges as just the union of all of them, as evidenced by the call to sort_and_merge_range_set(). (Which was already used, unlike what the comment said.) Fix by splitting out the meat of range_set_append() to a new _unsafe() function that lacks the paranoia. sort_and_merge_range_set will fix up the ranges, so we don't need the checks there. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>