Auto merge of #4717 - bundler:seg-deinit-submodules, r=indirect

[GitProxy] Deinit submodules if they are not requested

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/bundler/source/git/git_proxy.rb b/lib/bundler/source/git/git_proxy.rb
index 9b0e95d1..84d7fee6 100644
--- a/lib/bundler/source/git/git_proxy.rb
+++ b/lib/bundler/source/git/git_proxy.rb
@@ -123,7 +123,11 @@ module Bundler
             git_retry %(fetch --force --quiet --tags "#{path}")
             git "reset --hard #{@revision}"
 
-            git_retry "submodule update --init --recursive" if submodules
+            if submodules
+              git_retry "submodule update --init --recursive"
+            elsif Gem::Version.create(version) >= Gem::Version.create("2.9.0")
+              git_retry "submodule deinit --all"
+            end
           end
         end