From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 Jul 2013 19:10:06 +0000 (-0700)
Subject: Merge branch 'es/line-log-further-fixes' into tr/line-log
X-Git-Tag: v1.8.4-rc0~13^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/efc5e5ef8e467ebbdd4f93c23f2269b907fcdc15

Merge branch 'es/line-log-further-fixes' into tr/line-log

* es/line-log-further-fixes:
line-log: fix "log -LN" crash when N is last line of file
range-set: satisfy non-empty ranges invariant
t4211: demonstrate crash when first -L encountered is empty range
t4211: demonstrate empty -L range crash
range-set: fix sort_and_merge_range_set() corner case bug
range_set: fix coalescing bug when range is a subset of another
t4211: fix broken test when one -L range is subset of another
---

efc5e5ef8e467ebbdd4f93c23f2269b907fcdc15