d22eb04475
When creating a shallow clone of a repository with submodules, the depth argument does not influence the submodules, i.e. the submodules are done as non-shallow clones. It is unclear what the best default is for the depth of submodules of a shallow clone, so we need to have the possibility to do all kinds of combinations: * shallow super project with shallow submodules e.g. build bots starting always from scratch. They want to transmit the least amount of network data as well as using the least amount of space on their hard drive. * shallow super project with unshallow submodules e.g. The superproject is just there to track a collection of repositories and it is not important to have the relationship between the repositories intact. However the history of the individual submodules matter. * unshallow super project with shallow submodules e.g. The superproject is the actual project and the submodule is a library which is rarely touched. The new switch to select submodules to be shallow or unshallow supports all of these three cases. It is easy to transition from the first to the second case by just unshallowing the submodules (`git submodule foreach git fetch --unshallow`), but it is not possible to transition from the second to the first case (as we would have already transmitted the non shallow over the network). That is why we want to make the first case the default in case of a shallow super project. This leads to the inconvenience in the second case with the shallow super project and unshallow submodules, as you need to pass `--no-shallow-submodules`. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
86 lines
1.9 KiB
Bash
Executable File
86 lines
1.9 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='Test shallow cloning of repos with submodules'
|
|
|
|
. ./test-lib.sh
|
|
|
|
pwd=$(pwd)
|
|
|
|
test_expect_success 'setup' '
|
|
git checkout -b master &&
|
|
test_commit commit1 &&
|
|
test_commit commit2 &&
|
|
mkdir sub &&
|
|
(
|
|
cd sub &&
|
|
git init &&
|
|
test_commit subcommit1 &&
|
|
test_commit subcommit2 &&
|
|
test_commit subcommit3
|
|
) &&
|
|
git submodule add "file://$pwd/sub" sub &&
|
|
git commit -m "add submodule"
|
|
'
|
|
|
|
test_expect_success 'nonshallow clone implies nonshallow submodule' '
|
|
test_when_finished "rm -rf super_clone" &&
|
|
git clone --recurse-submodules "file://$pwd/." super_clone &&
|
|
(
|
|
cd super_clone &&
|
|
git log --oneline >lines &&
|
|
test_line_count = 3 lines
|
|
) &&
|
|
(
|
|
cd super_clone/sub &&
|
|
git log --oneline >lines &&
|
|
test_line_count = 3 lines
|
|
)
|
|
'
|
|
|
|
test_expect_success 'shallow clone implies 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 = 1 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 &&
|
|
(
|
|
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 'non shallow clone with shallow submodule' '
|
|
test_when_finished "rm -rf super_clone" &&
|
|
git clone --recurse-submodules --no-local --shallow-submodules "file://$pwd/." super_clone &&
|
|
(
|
|
cd super_clone &&
|
|
git log --oneline >lines &&
|
|
test_line_count = 3 lines
|
|
) &&
|
|
(
|
|
cd super_clone/sub &&
|
|
git log --oneline >lines &&
|
|
test_line_count = 1 lines
|
|
)
|
|
'
|
|
|
|
test_done
|