diff options
| author | Samuel Giddins <segiddins@segiddins.me> | 2017-05-25 23:52:46 -0500 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2017-05-29 18:41:52 -0500 |
| commit | 5161573850d621f002c50cddcbc1ca2d3980a519 (patch) | |
| tree | 67a42fb473d0bc2c88dae408ebba209764d2f595 /lib/bundler/installer.rb | |
| parent | b2bb1a3befd9e0c911da4e7438888fa005e7353d (diff) | |
| download | bundler-seg-git-force-no-git-ops.tar.gz | |
Add specs for install --force with git specsseg-git-force-no-git-ops
Diffstat (limited to 'lib/bundler/installer.rb')
| -rw-r--r-- | lib/bundler/installer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb index a3e8d3c62d..efad66e202 100644 --- a/lib/bundler/installer.rb +++ b/lib/bundler/installer.rb @@ -215,7 +215,7 @@ module Bundler end def resolve_if_need(options) - if !options["update"] && !options[:inline] && Bundler.default_lockfile.file? + if !options["update"] && !options[:inline] && !options["force"] && Bundler.default_lockfile.file? local = Bundler.ui.silence do begin tmpdef = Definition.build(Bundler.default_gemfile, Bundler.default_lockfile, nil) |