tree a22ba5570f45c77d5a34103b2bc4c1fb61f104e8
parent abe62a403f2d3fce004f57e0e7371523761e723f
parent aaae0bf787f09ba102f69c3cf85d37e6554ab9fd
author Junio C Hamano <gitster@pobox.com> 1489697802 -0700
committer Junio C Hamano <gitster@pobox.com> 1489697802 -0700

Merge branch 'ax/line-log-range-merge-fix' into maint

The code to parse "git log -L..." command line was buggy when there
are many ranges specified with -L; overrun of the allocated buffer
has been fixed.

* ax/line-log-range-merge-fix:
  line-log.c: prevent crash during union of too many ranges