summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorfatkodima <fatkodima123@gmail.com>2019-11-03 01:10:53 +0200
committerfatkodima <fatkodima123@gmail.com>2019-11-21 14:56:44 +0200
commit5c93791cf06e324e87875b6b25ee1baf0705dcf9 (patch)
treeeb7d4ebcbe75b4e2595f4653208c4f48f7b6cd5e /lib
parenta11c104c5b6222c018248b585cca2a4f340a9a71 (diff)
downloadbundler-5c93791cf06e324e87875b6b25ee1baf0705dcf9.tar.gz
Add :glob to git source uniqueness
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/source/git.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/bundler/source/git.rb b/lib/bundler/source/git.rb
index ab997ec47c..5ddfef873e 100644
--- a/lib/bundler/source/git.rb
+++ b/lib/bundler/source/git.rb
@@ -8,7 +8,7 @@ module Bundler
class Git < Path
autoload :GitProxy, File.expand_path("git/git_proxy", __dir__)
- attr_reader :uri, :ref, :branch, :options, :submodules
+ attr_reader :uri, :ref, :branch, :options, :glob, :submodules
def initialize(options)
@options = options
@@ -48,13 +48,14 @@ module Bundler
end
def hash
- [self.class, uri, ref, branch, name, version, submodules].hash
+ [self.class, uri, ref, branch, name, version, glob, submodules].hash
end
def eql?(other)
other.is_a?(Git) && uri == other.uri && ref == other.ref &&
branch == other.branch && name == other.name &&
- version == other.version && submodules == other.submodules
+ version == other.version && glob == other.glob &&
+ submodules == other.submodules
end
alias_method :==, :eql?