diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-05 02:02:01 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-05 02:02:01 +0400 |
| commit | 2071fb015bc673d2514142d7614b56a37b3faaf2 (patch) | |
| tree | 8bd133ee781324212c8ebc395178d20707082ae2 /t/t7403-submodule-sync.sh | |
| parent | 2c320e71bfae3d2972d41680a04b78cbd42cb941 (diff) | |
| parent | 794a3592ad9d8a9b273f6496052bbcb46b1924ed (diff) | |
Merge branch 'jl/submodule-fetch-on-demand'
* jl/submodule-fetch-on-demand:
fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
submodule update: Don't fetch when the submodule commit is already present
fetch/pull: Don't recurse into a submodule when commits are already present
Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
config: teach the fetch.recurseSubmodules option the 'on-demand' value
fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
fetch/pull: recurse into submodules when necessary
Conflicts:
builtin/fetch.c
submodule.c
Diffstat (limited to 't/t7403-submodule-sync.sh')
| -rwxr-xr-x | t/t7403-submodule-sync.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh index e5b19538b0..d600583cef 100755 --- a/t/t7403-submodule-sync.sh +++ b/t/t7403-submodule-sync.sh @@ -52,7 +52,7 @@ test_expect_success 'change submodule url' ' test_expect_success '"git submodule sync" should update submodule URLs' ' (cd super-clone && - git pull && + git pull --no-recurse-submodules && git submodule sync ) && test -d "$(git config -f super-clone/submodule/.git/config \ |