aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bundler/source.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-06-14 12:42:46 +0200
committerJosé Valim <jose.valim@plataformatec.com.br>2012-06-14 12:42:52 +0200
commit53605180b9f5d2791202e48f0c8d702bbbdb37ad (patch)
treeebefab407e41ec3c18547e823396cbd72921f695 /lib/bundler/source.rb
parenta8128bf0fb793482cb7cb024665e7421d13e202b (diff)
downloadbundler-53605180b9f5d2791202e48f0c8d702bbbdb37ad.tar.gz
Ensure branch checks are enforced on local overrides, closes #1837
Diffstat (limited to 'lib/bundler/source.rb')
-rw-r--r--lib/bundler/source.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb
index d9d5dc64..10ade87d 100644
--- a/lib/bundler/source.rb
+++ b/lib/bundler/source.rb
@@ -628,7 +628,7 @@ module Bundler
end
end
- attr_reader :uri, :ref, :options, :submodules
+ attr_reader :uri, :ref, :branch, :options, :submodules
def initialize(options)
@options = options
@@ -641,6 +641,7 @@ module Bundler
%w(ref branch tag revision).each{|k| options[k] = options[k].to_s if options[k] }
@uri = options["uri"]
+ @branch = options["branch"]
@ref = options["ref"] || options["branch"] || options["tag"] || 'master'
@submodules = options["submodules"]
@name = options["name"]
@@ -670,6 +671,7 @@ module Bundler
Git === o &&
uri == o.uri &&
ref == o.ref &&
+ branch == o.branch &&
name == o.name &&
version == o.version &&
submodules == o.submodules