diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2010-11-10 23:55:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-12 23:06:03 (GMT) |
| commit | be254a0ea99b441a6c514cb8b25cd72357383700 (patch) | |
| tree | 2bd92c9b1ad1c034f5f23945a2ac19530f841bd8 /t/t5526-fetch-submodules.sh | |
| parent | 7dce19d374a37932e9d4c3a6202af407cf5114eb (diff) | |
| download | git-be254a0ea99b441a6c514cb8b25cd72357383700.zip git-be254a0ea99b441a6c514cb8b25cd72357383700.tar.gz git-be254a0ea99b441a6c514cb8b25cd72357383700.tar.bz2 | |
Add the 'fetch.recurseSubmodules' config setting
This new boolean option can be used to override the default for "git
fetch" and "git pull", which is to not recurse into populated submodules
and fetch all new commits there too.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5526-fetch-submodules.sh')
| -rwxr-xr-x | t/t5526-fetch-submodules.sh | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh index 9c1d3a0..71e2a66 100755 --- a/t/t5526-fetch-submodules.sh +++ b/t/t5526-fetch-submodules.sh @@ -106,4 +106,40 @@ test_expect_success "--dry-run propagates to submodules" ' test_cmp expect.err actual.err ' +test_expect_success "recurseSubmodules=true propagates into submodules" ' + add_upstream_commit && + ( + cd downstream && + git config fetch.recurseSubmodules true + git fetch >../actual.out 2>../actual.err + ) && + test_cmp expect.out actual.out && + test_cmp expect.err actual.err +' + +test_expect_success "--recurse-submodules overrides config in submodule" ' + add_upstream_commit && + ( + cd downstream && + ( + cd submodule && + git config fetch.recurseSubmodules false + ) && + git fetch --recurse-submodules >../actual.out 2>../actual.err + ) && + test_cmp expect.out actual.out && + test_cmp expect.err actual.err +' + +test_expect_success "--no-recurse-submodules overrides config setting" ' + add_upstream_commit && + ( + cd downstream && + git config fetch.recurseSubmodules true + git fetch --no-recurse-submodules >../actual.out 2>../actual.err + ) && + ! test -s actual.out && + ! test -s actual.err +' + test_done |