diff options
| author | Hiroshi SHIBATA <[email protected]> | 2020-10-15 13:20:25 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2020-10-15 17:19:02 +0900 |
| commit | d386a58f6f1865aaa35eda5af55cff3ff3cca4ca (patch) | |
| tree | 0665fe806540deae7f8e52095af6dba70f940aa3 /lib/bundler/source/git | |
| parent | 7ffd14a18c341565afaf80d259f9fe5df8a13d29 (diff) | |
Merge bundler-2.2.0.rc.2
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3659
Diffstat (limited to 'lib/bundler/source/git')
| -rw-r--r-- | lib/bundler/source/git/git_proxy.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/bundler/source/git/git_proxy.rb b/lib/bundler/source/git/git_proxy.rb index da03efde0c..5dc1c8de32 100644 --- a/lib/bundler/source/git/git_proxy.rb +++ b/lib/bundler/source/git/git_proxy.rb @@ -136,11 +136,13 @@ module Bundler if submodules git_retry "submodule update --init --recursive", :dir => destination elsif Gem::Version.create(version) >= Gem::Version.create("2.9.0") - git_retry "submodule deinit --all --force", :dir => destination + inner_command = "git -C $toplevel submodule deinit --force $sm_path" + inner_command = inner_command.gsub("$") { '\$' } unless Bundler::WINDOWS + git_retry "submodule foreach --quiet \"#{inner_command}\"", :dir => destination end end - private + private def git_null(command, dir: SharedHelpers.pwd) check_allowed(command) |