From 098305e6798cf64bf0eaf8f7b92e5f1fce23b301 Mon Sep 17 00:00:00 2001
From: "L. E. Segovia" <amyspark@users.noreply.github.com>
Date: Wed, 18 Oct 2017 08:37:24 -0300
Subject: [PATCH] Correct setting and deleting HOMEBREW_HELP (and also delete
 the extra help_flag case, it's no longer needed)

---
 Library/Homebrew/brew.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Library/Homebrew/brew.rb b/Library/Homebrew/brew.rb
index f73ca46ed8..ef8b28aa9c 100644
--- a/Library/Homebrew/brew.rb
+++ b/Library/Homebrew/brew.rb
@@ -44,9 +44,6 @@ begin
       help_flag = true
     elsif !cmd && !help_flag_list.include?(arg)
       cmd = ARGV.delete_at(i)
-    elsif help_flag_list.include?(arg) && cmd
-      # cmd determined, and it needs help
-      help_flag = true
     end
   end
 
@@ -121,13 +118,13 @@ begin
     end
     if help_flag
       # Unset HOMEBREW_HELP to avoid confusing the tap
-      ENV["HOMEBREW_HELP"] = nil
+      ENV.delete("HOMEBREW_HELP")
     end
     tap_commands += %W[#{HOMEBREW_BREW_FILE} tap #{possible_tap}]
     safe_system(*tap_commands)
     if help_flag
       # Restore HOMEBREW_HELP after the tap
-      ENV["HOMEBREW_HELP"] = 1
+      ENV["HOMEBREW_HELP"] = "1"
     end
     exec HOMEBREW_BREW_FILE, cmd, *ARGV
   end