added variable to be able to turn off recursive submodules update

capistrano · Jun 22, 2011 · 1ffcb85 · 1ffcb85
1 parent a5d2e4c
commit 1ffcb85
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/lib/capistrano/recipes/deploy/scm/git.rb b/lib/capistrano/recipes/deploy/scm/git.rb
@@ -148,7 +148,11 @@ def checkout(revision, destination)
           if variable(:git_enable_submodules)
             execute << "#{git} submodule #{verbose} init"
             execute << "#{git} submodule #{verbose} sync"
-            execute << "#{git} submodule #{verbose} update --init --recursive"
+            if false == variable(:git_submodules_recursive)
+              execute << "#{git} submodule #{verbose} update --init"
+            else
+              execute << "#{git} submodule #{verbose} update --init --recursive"
+            end
           end
 
           execute.join(" && ")
@@ -187,7 +191,11 @@ def sync(revision, destination)
             execute << "#{git} submodule #{verbose} init"
             execute << "for mod in `#{git} submodule status | awk '{ print $2 }'`; do #{git} config -f .git/config submodule.${mod}.url `#{git} config -f .gitmodules --get submodule.${mod}.url` && echo Synced $mod; done"
             execute << "#{git} submodule #{verbose} sync"
-            execute << "#{git} submodule #{verbose} update --init --recursive"
+            if false == variable(:git_submodules_recursive)
+              execute << "#{git} submodule #{verbose} update --init"
+            else
+              execute << "#{git} submodule #{verbose} update --init --recursive"
+            end
           end
 
           # Make sure there's nothing else lying around in the repository (for