Merge branch 'nd/index-pack-one-fd-per-thread' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:47:58 +0000 (11:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:47:58 +0000 (11:47 -0700)
We used to disable threaded "git index-pack" on platforms without
thread-safe pread(); use a different workaround for such
platforms to allow threaded "git index-pack".

* nd/index-pack-one-fd-per-thread:
index-pack: work around thread-unsafe pread()

1  2 
Makefile
builtin/index-pack.c
config.mak.uname
diff --cc Makefile
Simple merge
Simple merge
Simple merge