From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Mar 2021 00:04:47 +0000 (-0800)
Subject: Merge branch 'jt/transfer-fsck-across-packs-fix'
X-Git-Tag: v2.31.0-rc2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c46f864e5db7c88fdee1d67dcc20a4451a12ca2;p=thirdparty%2Fgit.git

Merge branch 'jt/transfer-fsck-across-packs-fix'

The code to fsck objects received across multiple packs during a
single git fetch session has been broken when the packfile URI
feature was in use.  A workaround has been added by disabling the
codepath to avoid keeping a packfile that is too small.

* jt/transfer-fsck-across-packs-fix:
  fetch-pack: do not mix --pack_header and packfile uri
---

6c46f864e5db7c88fdee1d67dcc20a4451a12ca2