Merge branch 'jc/fix-alloc-sortbuf-in-index-pack'
commit0bf46af089cd01516c298a97f72f360fdbe6df85
authorJunio C Hamano <gitster@pobox.com>
Thu, 9 Jul 2015 21:31:42 +0000 (9 14:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Jul 2015 21:31:42 +0000 (9 14:31 -0700)
tree45b71014afca955341cefcf3ce9b562f1aa1886c
parent5bdb7a78adf2a2656a1915e6fa656aecb45c1fc3
parent781d93067d3ab8b448a4c8989a6e3cac17009061
Merge branch 'jc/fix-alloc-sortbuf-in-index-pack'

A hotfix for what is in 2.5-rc but not in 2.4.

* jc/fix-alloc-sortbuf-in-index-pack:
  index-pack: fix allocation of sorted_by_pos array
builtin/index-pack.c