From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Sep 2013 19:39:05 +0000 (-0700)
Subject: Merge branch 'jk/upload-pack-keepalive'
X-Git-Tag: v1.8.5-rc0~90
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b8315bb593c38ac957486916512e9a5df6df087;p=thirdparty%2Fgit.git

Merge branch 'jk/upload-pack-keepalive'

When running "fetch -q", a long silence while the sender side
computes the set of objects to send can be mistaken by proxies as
dropped connection.  The server side has been taught to send a small
empty messages to keep the connection alive.

* jk/upload-pack-keepalive:
  upload-pack: bump keepalive default to 5 seconds
  upload-pack: send keepalive packets during pack computation
---

7b8315bb593c38ac957486916512e9a5df6df087