move validation into #validate_keys

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index ec434bf622..b1f2dec39e 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -321,10 +321,6 @@ module Bundler
 
       normalize_hash(opts)
 
-      if opts["branch"] && !(opts["git"] || opts["github"])
-        raise GemfileError, %(The `branch` option for `gem "#{name}"` is not allowed. Only gems with a git source can specify a branch)
-      end
-
       git_names = @git_sources.keys.map(&:to_s)
       validate_keys("gem '#{name}'", opts, valid_keys + git_names)
 
@@ -388,6 +384,11 @@ module Bundler
 
     def validate_keys(command, opts, valid_keys)
       invalid_keys = opts.keys - valid_keys
+
+      if opts["branch"] && !(opts["git"] || opts["github"])
+        raise GemfileError, %(The `branch` option for `#{command}` is not allowed. Only gems with a git source can specify a branch)
+      end
+
       if invalid_keys.any?
         message = String.new
         message << "You passed #{invalid_keys.map {|k| ":" + k }.join(", ")} "