Merge branch 'jt/transfer-fsck-across-packs-fix'
commit6c46f864e5db7c88fdee1d67dcc20a4451a12ca2
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Mar 2021 00:04:47 +0000 (8 16:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Mar 2021 00:04:47 +0000 (8 16:04 -0800)
tree7e78dd9fe75257c8ceae42211477a711f09f1cd2
parentbe7935ed8bff19f481b033d0d242c5d5f239ed50
parent2aec3bc4b64ae4980dda86ed77f372a1f66acc7f
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
fetch-pack.c
t/t5702-protocol-v2.sh