Merge branch 'nd/index-pack-threaded-fixes'
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 16:06:23 +0000 (1 09:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2013 16:06:23 +0000 (1 09:06 -0700)
"index-pack --verify-stat" used a few counters outside protection
of mutex, possibly showing incorrect numbers.

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

1  2 
builtin/index-pack.c

Simple merge