Merge branch 'nd/index-pack-threaded-fixes' into maint
commitf4df84de629baf0857634ee103a24c86a607bfe2
authorJunio C Hamano <gitster@pobox.com>
Thu, 4 Apr 2013 20:00:41 +0000 (4 13:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 4 Apr 2013 20:00:41 +0000 (4 13:00 -0700)
tree952fe25a4f8ee9c8162fa4be82829f4cfdf724f7
parent68447f04f45cd7689e635714bcb778cb3e2c725d
parent8f82aad4e7baf32942eb2087a882e0f8646b2da8
Merge branch 'nd/index-pack-threaded-fixes' into maint

* nd/index-pack-threaded-fixes:
  index-pack: guard nr_resolved_deltas reads by lock
  index-pack: protect deepest_delta in multithread code
builtin/index-pack.c