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

Junio C Hamano committed Jul 6, 2016 at 13:06 UTC 1f5d429e4a15e909214785e30bb81168932fdc54

No changes.