projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4999266 df6308e)
Merge branch 'es/line-log-further-fixes' into tr/line-log
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 Jul 2013 19:10:06 +0000 (12:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Jul 2013 19:10:06 +0000 (12:10 -0700)
commitefc5e5ef8e467ebbdd4f93c23f2269b907fcdc15
tree2e30481c590aa53020d8b6fe49c52729a0c803d7tree | snapshot
parent499926670665570d785bc7baca4d7cd4420823dccommit | diff
parentdf6308eb82bc9d2074b35387583548b8b153433dcommit | diff
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
Unnamed repository; edit this file 'description' to name the repository.