From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 1 May 2020 20:40:00 +0000 (-0700)
Subject: Merge branch 'jt/v2-fetch-nego-fix'
X-Git-Tag: v2.27.0-rc0~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b07eecf6ed9334f09d6624732a4af2da03e38eb;p=thirdparty%2Fgit.git

Merge branch 'jt/v2-fetch-nego-fix'

The upload-pack protocol v2 gave up too early before finding a
common ancestor, resulting in a wasteful fetch from a fork of a
project.  This has been corrected to match the behaviour of v0
protocol.

* jt/v2-fetch-nego-fix:
  fetch-pack: in protocol v2, reset in_vain upon ACK
  fetch-pack: in protocol v2, in_vain only after ACK
  fetch-pack: return enum from process_acks()
---

0b07eecf6ed9334f09d6624732a4af2da03e38eb