diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-03-08 16:04:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-08 16:04:47 -0800 |
| commit | 6c46f864e5db7c88fdee1d67dcc20a4451a12ca2 (patch) | |
| tree | 7e78dd9fe75257c8ceae42211477a711f09f1cd2 /t/t3507-cherry-pick-conflict.sh | |
| parent | Merged the open-eintr workaround for macOS (diff) | |
| parent | fetch-pack: do not mix --pack_header and packfile uri (diff) | |
| download | tgif-6c46f864e5db7c88fdee1d67dcc20a4451a12ca2.tar.xz | |
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
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions