Merge branch 'nd/index-pack-one-fd-per-thread'

Enable threaded index-pack on platforms without thread-unsafe
pread() emulation.

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

diff --cc Makefile
Simple merge

diff --cc builtin/index-pack.c
index 1bac0f533b1f8e16714b254b1dfe11d6a8f7fd9d,ed489bbe9aab3ae7268f139f2d34c737880be49c..87d8dd81cc4c24ecf7feee932bc8b39a826bb55d
--- 1/builtin/index-pack.c
--- 2/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@@ -542,7 -549,7 +549,7 @@@ static void *unpack_data(struct object_
  
        do {
                ssize_t n = (len < 64*1024) ? len : 64*1024;
-               n = xpread(pack_fd, inbuf, n, from);
 -              n = pread(get_thread_data()->pack_fd, inbuf, n, from);
++              n = xpread(get_thread_data()->pack_fd, inbuf, n, from);
                if (n < 0)
                        die_errno(_("cannot pread pack file"));
                if (!n)

diff --cc config.mak.uname
Simple merge