diff options
| author | Stefan Lance <stefan@lances.net> | 2015-08-15 15:07:42 -0500 |
|---|---|---|
| committer | Stefan Lance <stefan@lances.net> | 2015-08-18 09:17:46 -0500 |
| commit | 777ae75adc9dbc2777abcbe8e04acde5f1dbe9eb (patch) | |
| tree | cac9b392338a06b4f378d666ec3b1137f197c752 | |
| parent | 1ada90873129f6db28124d09d3d2d25ce34d9f65 (diff) | |
| download | bundler-777ae75adc9dbc2777abcbe8e04acde5f1dbe9eb.tar.gz | |
Use lockfile_name instead of gemfile_name in an error message
| -rw-r--r-- | lib/bundler/source/git.rb | 2 | ||||
| -rw-r--r-- | spec/install/gemfile/git_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/source/git.rb b/lib/bundler/source/git.rb index cb7f9970ed..8d067f00f0 100644 --- a/lib/bundler/source/git.rb +++ b/lib/bundler/source/git.rb @@ -130,7 +130,7 @@ module Bundler changed = cached_revision && cached_revision != git_proxy.revision if changed && !@unlocked && !git_proxy.contains?(cached_revision) - raise GitError, "The #{SharedHelpers.gemfile_name} lock is pointing to revision #{shortref_for_display(cached_revision)} " \ + raise GitError, "The #{SharedHelpers.lockfile_name} is pointing to revision #{shortref_for_display(cached_revision)} " \ "but the current branch in your local override for #{name} does not contain such commit. " \ "Please make sure your branch is up to date." end diff --git a/spec/install/gemfile/git_spec.rb b/spec/install/gemfile/git_spec.rb index bca6ad0651..a57ef33f23 100644 --- a/spec/install/gemfile/git_spec.rb +++ b/spec/install/gemfile/git_spec.rb @@ -332,7 +332,7 @@ describe "bundle install with git sources" do bundle %|config local.rack #{lib_path("local-rack")}| bundle :install - expect(err).to match(/The gems.rb lock is pointing to revision \w+/) + expect(err).to match(/The gems.locked is pointing to revision \w+/) end end |