From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Mar 2011 21:09:08 +0000 (-0700)
Subject: Merge branch 'jc/fetch-progressive-stride'
X-Git-Tag: v1.7.5-rc0~5
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=96220d837c4f58a6be447127b727b8a55246d231

Merge branch 'jc/fetch-progressive-stride'

* jc/fetch-progressive-stride:
  Fix potential local deadlock during fetch-pack
---

96220d837c4f58a6be447127b727b8a55246d231
diff --cc builtin/fetch-pack.c
index 65a8727453,147d67dca4..85aff029b2
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@@ -219,17 -218,8 +219,18 @@@ static void send_request(int fd, struc
  		safe_write(fd, buf->buf, buf->len);
  }
  
 +static void insert_one_alternate_ref(const struct ref *ref, void *unused)
 +{
 +	rev_list_insert_ref(NULL, ref->old_sha1, 0, NULL);
 +}
 +
 +static void insert_alternate_refs(void)
 +{
 +	foreach_alt_odb(refs_from_alternate_cb, insert_one_alternate_ref);
 +}
 +
  #define INITIAL_FLUSH 16
+ #define PIPESAFE_FLUSH 32
  #define LARGE_FLUSH 1024
  
  static int next_flush(int count)