From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Jun 2014 19:06:42 +0000 (-0700)
Subject: Merge branch 'nd/index-pack-one-fd-per-thread'
X-Git-Tag: v2.1.0-rc0~198
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53f52cd92acb033df4a50d1557bae9c55c2d4d67;p=thirdparty%2Fgit.git

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()
---

53f52cd92acb033df4a50d1557bae9c55c2d4d67
diff --cc builtin/index-pack.c
index 1bac0f533b,ed489bbe9a..87d8dd81cc
--- a/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)