From 00d1bb8d12126b415bd2737b08dd4af35a76ac9e Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 13 Aug 2014 08:45:07 +0100
Subject: [PATCH] Revert "Remove unused branches from Options.coerce"

This reverts commit cee42c339e7632eab15111e2c4e6c121ace6f9e2.
---
 Library/Homebrew/options.rb           | 2 ++
 Library/Homebrew/test/test_options.rb | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/Library/Homebrew/options.rb b/Library/Homebrew/options.rb
index 86be67ea93..6b982a4059 100644
--- a/Library/Homebrew/options.rb
+++ b/Library/Homebrew/options.rb
@@ -116,6 +116,8 @@ class Options
 
   def self.coerce(arg)
     case arg
+    when self then arg
+    when Option then new << arg
     when Array
       opts = new
       arg.each do |a|
diff --git a/Library/Homebrew/test/test_options.rb b/Library/Homebrew/test/test_options.rb
index 250360a307..4b99158748 100644
--- a/Library/Homebrew/test/test_options.rb
+++ b/Library/Homebrew/test/test_options.rb
@@ -132,6 +132,15 @@ class OptionsTests < Homebrew::TestCase
     assert_equal [foo, bar, baz].sort, (@options | options).to_a.sort
   end
 
+  def test_coerce_with_options
+    assert_same @options, Options.coerce(@options)
+  end
+
+  def test_coerce_with_option
+    option = Option.new("foo")
+    assert_equal option, Options.coerce(option).to_a.first
+  end
+
   def test_coerce_with_array
     array = %w{--foo --bar}
     option1 = Option.new("foo")