mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clone: do not let --depth imply --shallow-submodules

Browse Source 
In v2.9.0, we prematurely flipped the default to force cloning
submodules shallowly, when the superproject is getting cloned
shallowly.  This is likely to fail when the upstream repositories
submodules are cloned from a repository that is not prepared to
serve histories that ends at a commit that is not at the tip of a
branch, and we know the world is not yet ready.

Use a safer default to clone the submodules fully, unless the user
tells us that she knows that the upstream repository of the
submodules are willing to cooperate with "--shallow-submodules"
option.

Noticed-by: Vadim Eisenberg <VADIME@il.ibm.com>
Helped-by: Jeff King <peff@peff.net>
Helped-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2016-06-19 13:51:56 -07:00
parent d22eb04475
commit 18a74a092b
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
t/t5614-clone-submodules.sh
View File

@ -37,7 +37,22 @@ 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 --shallow-submodules "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 = 1 lines
)
'
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 &&
(
@ -48,7 +63,7 @@ test_expect_success 'shallow clone implies shallow submodule' '
(
cd super_clone/sub &&
git log --oneline >lines &&
test_line_count = 1 lines
test_line_count = 3 lines
)
'