summaryrefslogtreecommitdiff
path: root/notes-merge.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-16 13:56:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-16 13:56:42 -0700
commitc5bd9e5a97ab987334b8dead3ffd353332014949 (patch)
treea22ba5570f45c77d5a34103b2bc4c1fb61f104e8 /notes-merge.h
parentMerge branch 'jk/add-i-patch-do-prompt' into maint (diff)
parentline-log.c: prevent crash during union of too many ranges (diff)
downloadtgif-c5bd9e5a97ab987334b8dead3ffd353332014949.tar.xz
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
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions