From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Sep 2016 23:57:13 +0000 (-0700)
Subject: Merge branch 'jt/fetch-pack-in-vain-count-with-stateless'
X-Git-Tag: v2.11.0-rc0~100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=938c2a63212847bf87fc2a7076ccd4e15dfa3955;p=thirdparty%2Fgit.git

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

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
---

938c2a63212847bf87fc2a7076ccd4e15dfa3955