From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Oct 2016 16:01:12 +0000 (-0700)
Subject: Merge branch 'jt/fetch-pack-in-vain-count-with-stateless' into maint
X-Git-Tag: v2.10.2~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9338904a5f91141ca2502abfbca87730a3aa48f0;p=thirdparty%2Fgit.git

Merge branch 'jt/fetch-pack-in-vain-count-with-stateless' into maint

When "git fetch" tries to find where the history of the repository
it runs in has diverged from what the other side has, it has a
mechanism to avoid digging too deep into irrelevant side branches.
This however did not work well over the "smart-http" transport due
to a design bug, which has been fixed.

* jt/fetch-pack-in-vain-count-with-stateless:
  fetch-pack: do not reset in_vain on non-novel acks
---

9338904a5f91141ca2502abfbca87730a3aa48f0