Merge branch 'jc/fetch-progressive-stride'

* jc/fetch-progressive-stride: Fix potential local deadlock during fetch-pack
git-mirror · Mar 29, 2011 · 96220d8 · 96220d8
2 parents 2eee139 + 44d8dc5
commit 96220d8
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
@@ -230,16 +230,17 @@ static void insert_alternate_refs(void)
 }
 
 #define INITIAL_FLUSH 16
+#define PIPESAFE_FLUSH 32
 #define LARGE_FLUSH 1024
 
 static int next_flush(int count)
 {
-	if (count < INITIAL_FLUSH * 2)
-		count += INITIAL_FLUSH;
-	else if (count < LARGE_FLUSH)
+	int flush_limit = args.stateless_rpc ? LARGE_FLUSH : PIPESAFE_FLUSH;
+
+	if (count < flush_limit)
 		count <<= 1;
 	else
-		count += LARGE_FLUSH;
+		count += flush_limit;
 	return count;
 }