diff options
author | Bundlerbot <bot@bundler.io> | 2019-11-26 21:53:48 +0000 |
---|---|---|
committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-12-13 20:07:18 +0100 |
commit | a137b11f1b727cfa0d4e3e92c72592181eb8645d (patch) | |
tree | f3533dda586f72ef0cc60efbfbbb3fb3b51732e2 /lib | |
parent | 098d6d961f9828c099b40a7e31d8de653a16c44b (diff) | |
download | bundler-a137b11f1b727cfa0d4e3e92c72592181eb8645d.tar.gz |
Merge #7419
7419: Add :glob to git source uniqueness r=deivid-rodriguez a=fatkodima
Closes #7346
Co-authored-by: fatkodima <fatkodima123@gmail.com>
(cherry picked from commit 87449d535a731b818411523e34468f1f548adca9)
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bundler/source/git.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/bundler/source/git.rb b/lib/bundler/source/git.rb index 736f5bb546..fcb0ce8e0e 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? |