@@ -112,7 +112,8 @@ module SourceControl private def git_update_submodule - git("submodule", ["update", "--init"]) + git("submodule", ["init"]) + git("submodule", ["update"]) end end lib/source_control/git.rb @@ -19,7 +19,8 @@ class SourceControl::GitTest < Test::Unit::TestCase in_sandbox do git = new_git git.expects(:git).with("reset", ["--hard", '5460c9ea8872745629918986df7238871f4135ae']) - git.expects(:git).with("submodule", ["update", "--init"]) + git.expects(:git).with("submodule", ["init"]) + git.expects(:git).with("submodule", ["update"]) git.update(Git::Revision.new(:number => '5460c9ea8872745629918986df7238871f4135ae')) end end @@ -28,7 +29,8 @@ class SourceControl::GitTest < Test::Unit::TestCase in_sandbox do git = new_git git.expects(:git).with("reset", ["--hard"]) - git.expects(:git).with("submodule", ["update", "--init"]) + git.expects(:git).with("submodule", ["init"]) + git.expects(:git).with("submodule", ["update"]) git.update end end test/unit/source_control/git_test.rb 615e81f90552a20a63c89e029b33adb10b30ed9e Chad Woolley thewoolleyman@gmail.com http://github.com/weplay/cruisecontrol.rb/commit/f2ff4a606bc2ee1a25e97db9b074343e6e84d0da f2ff4a606bc2ee1a25e97db9b074343e6e84d0da 2009-05-12T10:18:16-07:00 2009-05-12T10:18:16-07:00 Split 'git submodule update --init' into separate 'init' and 'update' commands. The '--init' option apparently doesn't work on some versions of git d06fd840f99f4d467fa63dee3fcfaf4a2689289e Chad Woolley thewoolleyman@gmail.com