Permalink
Browse files

Ensure branch checks are enforced on local overrides, closes #1837

  • Loading branch information...
1 parent a8128bf commit 53605180b9f5d2791202e48f0c8d702bbbdb37ad @josevalim josevalim committed Jun 14, 2012
Showing with 3 additions and 1 deletion.
  1. +3 −1 lib/bundler/source.rb
@@ -628,7 +628,7 @@ def allowed_in_path
end
end
- attr_reader :uri, :ref, :options, :submodules
+ attr_reader :uri, :ref, :branch, :options, :submodules
def initialize(options)
@options = options
@@ -641,6 +641,7 @@ def initialize(options)
%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 @@ def eql?(o)
Git === o &&
uri == o.uri &&
ref == o.ref &&
+ branch == o.branch &&
name == o.name &&
version == o.version &&
submodules == o.submodules

0 comments on commit 5360518

Please sign in to comment.