Merge branch 'jk/index-pack-threading-races' into maint
commit46092ebf224d45464ef5663544b19b38b95a51c9
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Sep 2014 05:09:24 +0000 (29 22:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Sep 2014 05:09:24 +0000 (29 22:09 -0700)
tree68c17a10c3df49d8fdfa6b34567a49a42cf89089
parent060517093ecfdf39e89edc79678ce1ba9ff52ec5
parentab791dd1383536405b8c68ffcf84246b3b0a9812
Merge branch 'jk/index-pack-threading-races' into maint

When receiving an invalid pack stream that records the same object
twice, multiple threads got confused due to a race.

* jk/index-pack-threading-races:
  index-pack: fix race condition with duplicate bases
builtin/index-pack.c