diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-21 18:30:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-21 18:30:11 (GMT) |
| commit | f62452ecfc99d914fe50f4e098c04e15cc1c7bae (patch) | |
| tree | 0a443fe078ce386b924aee9cc5304b857678a88f /t | |
| parent | fddf9a2d06719555fba8ce0cd09a695f012cca04 (diff) | |
| parent | 98a2ea46c2dedf45b5a94335462547a5d78a68e2 (diff) | |
| download | git-f62452ecfc99d914fe50f4e098c04e15cc1c7bae.zip git-f62452ecfc99d914fe50f4e098c04e15cc1c7bae.tar.gz git-f62452ecfc99d914fe50f4e098c04e15cc1c7bae.tar.bz2 | |
Merge branch 'jt/transfer-fsck-with-promissor'
The transfer.fsckobjects configuration tells "git fetch" to
validate the data and connected-ness of objects in the received
pack; the code to perform this check has been taught about the
narrow clone's convention that missing objects that are reachable
from objects in a pack that came from a promissor remote is OK.
* jt/transfer-fsck-with-promissor:
fetch-pack: do not check links for partial fetch
index-pack: support checking objects but not links
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5302-pack-index.sh | 5 | ||||
| -rwxr-xr-x | t/t5616-partial-clone.sh | 11 |
2 files changed, 16 insertions, 0 deletions
diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh index c2fc584..d695a60 100755 --- a/t/t5302-pack-index.sh +++ b/t/t5302-pack-index.sh @@ -262,4 +262,9 @@ EOF grep "^warning:.* expected .tagger. line" err ' +test_expect_success 'index-pack --fsck-objects also warns upon missing tagger in tag' ' + git index-pack --fsck-objects tag-test-${pack1}.pack 2>err && + grep "^warning:.* expected .tagger. line" err +' + test_done diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh index 29d8631..cee5565 100755 --- a/t/t5616-partial-clone.sh +++ b/t/t5616-partial-clone.sh @@ -143,4 +143,15 @@ test_expect_success 'manual prefetch of missing objects' ' test_line_count = 0 observed.oids ' +test_expect_success 'partial clone with transfer.fsckobjects=1 uses index-pack --fsck-objects' ' + git init src && + test_commit -C src x && + test_config -C src uploadpack.allowfilter 1 && + test_config -C src uploadpack.allowanysha1inwant 1 && + + GIT_TRACE="$(pwd)/trace" git -c transfer.fsckobjects=1 \ + clone --filter="blob:none" "file://$(pwd)/src" dst && + grep "git index-pack.*--fsck-objects" trace +' + test_done |