diff options
| author | The Bundler Bot <bot@bundler.io> | 2017-05-23 23:20:58 +0000 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2017-06-01 23:55:32 -0500 |
| commit | 08cbe2b6ea6a1019a72c8de7838c56ade9c1e814 (patch) | |
| tree | d3154c38b6b5312cbd5223587fa9023c3bac8307 | |
| parent | c5305b031074fe78d52c130e80d2e6ea8545a505 (diff) | |
| download | bundler-08cbe2b6ea6a1019a72c8de7838c56ade9c1e814.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
```
(cherry picked from commit 54c51729e4776c3d07992deaedb8ec2788cb35ae)
| -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 e9b9c4dbe4..0732432ba2 100644 --- a/lib/bundler/source/git/git_proxy.rb +++ b/lib/bundler/source/git/git_proxy.rb @@ -132,7 +132,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 |