diff options
author | elijah <elijah@riseup.net> | 2016-07-12 11:09:21 -0700 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2016-07-12 11:09:21 -0700 |
commit | 61227c6a129f6d01438ed33b68ebafcb8f0a2125 (patch) | |
tree | 01926f884a001cc281d8e253e22978cd5ba1d56b | |
parent | f294ddcca7fbe20de788053bfba1cc9c8417ddd8 (diff) | |
parent | 9c9629981f23cc9d9f4f60577ae58406c20b793f (diff) |
Merge branch 'fix_subrepo_behavior' of https://github.com/pixelated/leap_platform into develop
-rw-r--r-- | lib/leap_cli/commands/deploy.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/leap_cli/commands/deploy.rb b/lib/leap_cli/commands/deploy.rb index d26b9905..a09fddbe 100644 --- a/lib/leap_cli/commands/deploy.rb +++ b/lib/leap_cli/commands/deploy.rb @@ -286,7 +286,7 @@ module LeapCli # repository. # def init_submodules - return unless is_git_directory?(Path.platform) + return unless is_git_directory?(Path.platform) && !is_git_subrepo?(Path.platform) Dir.chdir Path.platform do assert_run! "git submodule sync" statuses = assert_run! "git submodule status" |