This is a re-roll of a patch [1] which fixes the
line-log.c:sort_and_merge_range_set() coalescing bug. This re-roll
inserts a new patch before the lone patch from v1.
patch 1/2: Fix broken tests in t4211 which should have detected the
sort_and_merge_range_set() bug but didn't due to incorrect
"expected" state. Mark the tests as expect-failure.
patch 2/2: Fix the sort_and_merge_range_set() coalesce bug. Same as v1
but also flips the tests to expect-success.
[1]: http://article.gmane.org/gmane.comp.version-control.git/229774
Eric Sunshine (2):
t4211: fix broken test when one -L range is subset of another
range_set: fix coalescing bug when range is a subset of another
line-log.c | 3 +-
t/t4211/expect.multiple-superset | 134 ++++++++++++++++++++++++++++++++++++++-
2 files changed, 133 insertions(+), 4 deletions(-)
--
1.8.3.2
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html