From c53a52daeecc55595ee5531a46ea1730eee27cda Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Wed, 16 May 2018 17:33:40 +0200
Subject: [PATCH] Move `--version` logic into `cmd/--version.rb`.

---
 Library/Homebrew/brew.rb          | 6 ------
 Library/Homebrew/brew.sh          | 1 +
 Library/Homebrew/cmd/--version.rb | 9 ++++-----
 Library/Homebrew/global.rb        | 1 +
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Library/Homebrew/brew.rb b/Library/Homebrew/brew.rb
index d571f7e5c6..c453938981 100644
--- a/Library/Homebrew/brew.rb
+++ b/Library/Homebrew/brew.rb
@@ -22,12 +22,6 @@ end
 
 require "global"
 
-if ARGV == %w[--version] || ARGV == %w[-v]
-  puts "Homebrew #{HOMEBREW_VERSION}"
-  puts "Homebrew/homebrew-core #{CoreTap.instance.version_string}"
-  exit 0
-end
-
 begin
   trap("INT", std_trap) # restore default CTRL-C handler
 
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index 98de43e286..ba7572439b 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -232,6 +232,7 @@ case "$HOMEBREW_COMMAND" in
   --repo)      HOMEBREW_COMMAND="--repository" ;;
   environment) HOMEBREW_COMMAND="--env" ;;
   --config)    HOMEBREW_COMMAND="config" ;;
+  -v)          HOMEBREW_COMMAND="--version" ;;
 esac
 
 if [[ "$HOMEBREW_COMMAND" = "cask" ]]
diff --git a/Library/Homebrew/cmd/--version.rb b/Library/Homebrew/cmd/--version.rb
index 736048341c..5459264c71 100644
--- a/Library/Homebrew/cmd/--version.rb
+++ b/Library/Homebrew/cmd/--version.rb
@@ -5,10 +5,9 @@ module Homebrew
   module_function
 
   def __version
-    # As a special case, `--version` is implemented directly in `brew.rb`. This
-    # file merely serves as a container for the documentation. It also catches
-    # the case where running `brew --version` with additional arguments would
-    # produce a rather cryptic message about a non-existent `--version` command.
-    raise UsageError
+    odie "This command does not take arguments." if ARGV.any?
+
+    puts "Homebrew #{HOMEBREW_VERSION}"
+    puts "Homebrew/homebrew-core #{CoreTap.instance.version_string}"
   end
 end
diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb
index 5d641f1e26..49f0e0f566 100644
--- a/Library/Homebrew/global.rb
+++ b/Library/Homebrew/global.rb
@@ -83,6 +83,7 @@ HOMEBREW_INTERNAL_COMMAND_ALIASES = {
   "--repo" => "--repository",
   "environment" => "--env",
   "--config" => "config",
+  "-v" => "--version",
 }.freeze
 
 require "set"