Merge branch 'nd/slim-index-pack-memory-usage'
commitc3b1c1e9b252ab7bf192c086df53288dbf769c80
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Jun 2015 21:27:08 +0000 (16 14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Jun 2015 21:27:08 +0000 (16 14:27 -0700)
tree4ef43a0120f2677a6d68b014113ba49bd851a2a9
parent486b51bc81e486c654ac35554b284816f4a6ae5c
parentf0e7f11d054b79de6e1f7bcee6e68c2f17af61bd
Merge branch 'nd/slim-index-pack-memory-usage'

An earlier optimization broke index-pack for a large object
transfer; this fixes it before the breakage hits any released
version.

* nd/slim-index-pack-memory-usage:
  index-pack: fix truncation of off_t in comparison
builtin/index-pack.c