diff options
| author | The Bundler Bot <bot@bundler.io> | 2017-05-23 23:20:58 +0000 |
|---|---|---|
| committer | The Bundler Bot <bot@bundler.io> | 2017-05-23 23:20:58 +0000 |
| commit | 54c51729e4776c3d07992deaedb8ec2788cb35ae (patch) | |
| tree | 75725ffbb4e8334210fb77927e4ffec5d09b4483 | |
| parent | 13c693f82bb2ba61132caa23eafee8907072450e (diff) | |
| parent | b6e10efd16909a21138ec67901f9b9faaada65e4 (diff) | |
| download | bundler-54c51729e4776c3d07992deaedb8ec2788cb35ae.tar.gz | |
Auto merge of #5673 - bundler:seg-force-submodule-deinit, r=indirect
[GitProxy] Force deinitializing submodules
Fixes the following test under newer git versions
```
bundle update
git sources
with submodules
unlocks the source when submodules are removed from git source
```
| -rw-r--r-- | lib/bundler/source/git/git_proxy.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/source/git/git_proxy.rb b/lib/bundler/source/git/git_proxy.rb index 70b2d7e4f9..e5edb0a9c9 100644 --- a/lib/bundler/source/git/git_proxy.rb +++ b/lib/bundler/source/git/git_proxy.rb @@ -135,7 +135,7 @@ module Bundler if submodules git_retry "submodule update --init --recursive" elsif Gem::Version.create(version) >= Gem::Version.create("2.9.0") - git_retry "submodule deinit --all" + git_retry "submodule deinit --all --force" end end end |