diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-28 10:00:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-28 10:00:00 -0700 |
| commit | 6653aa9ecd955faccb0ace6f2d8c374b8ea7daaa (patch) | |
| tree | 643c1402099b6bfec3711b29280ee3cf4dc2a177 /t | |
| parent | e2652c0bcfdeee88f416c6e2c34163545ea30047 (diff) | |
| parent | 6035d6aad8ca11954c0d7821f6f3e7c047039c8f (diff) | |
| download | git-6653aa9ecd955faccb0ace6f2d8c374b8ea7daaa.tar.gz git-6653aa9ecd955faccb0ace6f2d8c374b8ea7daaa.tar.xz | |
Merge branch 'nd/clone-connectivity-shortcut' (early part) into maint
Cloning with "git clone --depth N" while fetch.fsckobjects (or
transfer.fsckobjects) is set to true did not tell the cut-off points
of the shallow history to the process that validates the objects and
the history received, causing the validation to fail.
* 'nd/clone-connectivity-shortcut' (early part):
fetch-pack: prepare updated shallow file before fetching the pack
clone: let the user know when check_everything_connected is run
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5500-fetch-pack.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh index 6133d9ed1..fd2598e60 100755 --- a/t/t5500-fetch-pack.sh +++ b/t/t5500-fetch-pack.sh @@ -135,6 +135,13 @@ test_expect_success 'clone shallow depth 1' ' test "`git --git-dir=shallow0/.git rev-list --count HEAD`" = 1 ' +test_expect_success 'clone shallow depth 1 with fsck' ' + git config --global fetch.fsckobjects true && + git clone --no-single-branch --depth 1 "file://$(pwd)/." shallow0fsck && + test "`git --git-dir=shallow0fsck/.git rev-list --count HEAD`" = 1 && + git config --global --unset fetch.fsckobjects +' + test_expect_success 'clone shallow' ' git clone --no-single-branch --depth 2 "file://$(pwd)/." shallow ' |