]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'nd/index-pack-threaded-fixes' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 4 Apr 2013 20:00:41 +0000 (13:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 4 Apr 2013 20:00:41 +0000 (13:00 -0700)
* 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