projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: abe62a4 aaae0bf)
Merge branch 'ax/line-log-range-merge-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Mar 2017 20:56:42 +0000 (13:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Mar 2017 20:56:42 +0000 (13:56 -0700)
commitc5bd9e5a97ab987334b8dead3ffd353332014949
treea22ba5570f45c77d5a34103b2bc4c1fb61f104e8tree | snapshot
parentabe62a403f2d3fce004f57e0e7371523761e723fcommit | diff
parentaaae0bf787f09ba102f69c3cf85d37e6554ab9fdcommit | diff
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
line-log.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.