]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jt/transfer-fsck-across-packs-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Mar 2021 00:04:47 +0000 (16:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Mar 2021 00:04:47 +0000 (16:04 -0800)
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

1  2 
fetch-pack.c
t/t5702-protocol-v2.sh

diff --cc fetch-pack.c
Simple merge
Simple merge