Merge branch 'jk/avoid-unbounded-alloca' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:06:39 +0000 (13:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:06:39 +0000 (13:06 -0700)
commit1f5d429e4a15e909214785e30bb81168932fdc54
tree7e6d5f5da9b14a5bde41a24bc3a8acbe32eb3a55
parentc0144452efbd4de667c26dacad7dfb9fbca99705
parentb8ba412bf7c38ac86dbaebdf939b0039bacf434c
Merge branch 'jk/avoid-unbounded-alloca' into maint

A codepath that used alloca(3) to place an unbounded amount of data
on the stack has been updated to avoid doing so.

* jk/avoid-unbounded-alloca:
  tree-diff: avoid alloca for large allocations
tree-diff.c