diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-11 10:44:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-11 10:44:12 -0700 |
| commit | 1a88ca99db81b0a5d0f43b57df4a265055d81436 (patch) | |
| tree | 17c974f6af5538a62965a50031f0afa44f9a6db4 /t | |
| parent | 4212e483a927138019206a5e682349d6867b7d89 (diff) | |
| parent | 18a74a092bff41f1ffe10bd2463d3eed9a04435d (diff) | |
| download | git-1a88ca99db81b0a5d0f43b57df4a265055d81436.tar.gz git-1a88ca99db81b0a5d0f43b57df4a265055d81436.tar.xz | |
Merge branch 'sb/clone-shallow-passthru' into maint
Fix an unintended regression in v2.9 that breaks "clone --depth"
that recurses down to submodules by forcing the submodules to also
be cloned shallowly, which many server instances that host upstream
of the submodules are not prepared for.
* sb/clone-shallow-passthru:
clone: do not let --depth imply --shallow-submodules
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5614-clone-submodules.sh | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/t/t5614-clone-submodules.sh b/t/t5614-clone-submodules.sh index 62044c5a0..a9aaa018e 100755 --- a/t/t5614-clone-submodules.sh +++ b/t/t5614-clone-submodules.sh @@ -37,9 +37,9 @@ test_expect_success 'nonshallow clone implies nonshallow submodule' ' ) ' -test_expect_success 'shallow clone implies shallow submodule' ' +test_expect_success 'shallow clone with shallow submodule' ' test_when_finished "rm -rf super_clone" && - git clone --recurse-submodules --depth 2 "file://$pwd/." super_clone && + git clone --recurse-submodules --depth 2 --shallow-submodules "file://$pwd/." super_clone && ( cd super_clone && git log --oneline >lines && @@ -52,6 +52,21 @@ test_expect_success 'shallow clone implies shallow submodule' ' ) ' +test_expect_success 'shallow clone does not imply shallow submodule' ' + test_when_finished "rm -rf super_clone" && + git clone --recurse-submodules --depth 2 "file://$pwd/." super_clone && + ( + cd super_clone && + git log --oneline >lines && + test_line_count = 2 lines + ) && + ( + cd super_clone/sub && + git log --oneline >lines && + test_line_count = 3 lines + ) +' + test_expect_success 'shallow clone with non shallow submodule' ' test_when_finished "rm -rf super_clone" && git clone --recurse-submodules --depth 2 --no-shallow-submodules "file://$pwd/." super_clone && |