aboutsummaryrefslogtreecommitdiff
path: root/fetch-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-08 21:39:38 -0700
committerJunio C Hamano <gitster@pobox.com>2016-09-08 21:39:38 -0700
commit49981d8a250837019b4a14f44d471fc6ff7e334f (patch)
treec3394268eaaade296d7de692fe7e76bacb3be97b /fetch-pack.c
parent0202c411edc25940cc381bf317badcdf67670be4 (diff)
parent6ebdac1bab966b720d776aa43ca188fe378b1f4b (diff)
downloadgit-49981d8a250837019b4a14f44d471fc6ff7e334f.tar.gz
git-49981d8a250837019b4a14f44d471fc6ff7e334f.tar.xz
Start maintenance track for 2.10.x series
Diffstat (limited to 'fetch-pack.c')
-rw-r--r--fetch-pack.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/fetch-pack.c b/fetch-pack.c
index b501d5c32..85e77af61 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -243,16 +243,21 @@ static void insert_one_alternate_ref(const struct ref *ref, void *unused)
#define INITIAL_FLUSH 16
#define PIPESAFE_FLUSH 32
-#define LARGE_FLUSH 1024
+#define LARGE_FLUSH 16384
static int next_flush(struct fetch_pack_args *args, int count)
{
- int flush_limit = args->stateless_rpc ? LARGE_FLUSH : PIPESAFE_FLUSH;
-
- if (count < flush_limit)
- count <<= 1;
- else
- count += flush_limit;
+ if (args->stateless_rpc) {
+ if (count < LARGE_FLUSH)
+ count <<= 1;
+ else
+ count = count * 11 / 10;
+ } else {
+ if (count < PIPESAFE_FLUSH)
+ count <<= 1;
+ else
+ count += PIPESAFE_FLUSH;
+ }
return count;
}