6 files changed, 8 insertions, 8 deletions
diff --git a/Library/Homebrew/cask/lib/hbc/installer.rb b/Library/Homebrew/cask/lib/hbc/installer.rb
index 8520f154d..a2833e8f9 100644
--- a/Library/Homebrew/cask/lib/hbc/installer.rb
+++ b/Library/Homebrew/cask/lib/hbc/installer.rb
@@ -75,7 +75,7 @@ module Hbc
       fetch
       uninstall_existing_cask if @reinstall
 
-      oh1 "Installing Cask #{@cask}"
+      oh1 "Installing Cask #{Formatter.identifier(@cask)}"
       stage
       install_artifacts
       enable_accessibility_access
@@ -348,7 +348,7 @@ module Hbc
     end
 
     def uninstall
-      oh1 "Uninstalling Cask #{@cask}"
+      oh1 "Uninstalling Cask #{Formatter.identifier(@cask)}"
       disable_accessibility_access
       uninstall_artifacts(clear: true)
       purge_versioned_files
@@ -356,7 +356,7 @@ module Hbc
     end
 
     def start_upgrade
-      oh1 "Starting upgrade for Cask #{@cask}"
+      oh1 "Starting upgrade for Cask #{Formatter.identifier(@cask)}"
 
       disable_accessibility_access
       uninstall_artifacts
diff --git a/Library/Homebrew/cmd/reinstall.rb b/Library/Homebrew/cmd/reinstall.rb
index 53c923d91..7c62d8092 100644
--- a/Library/Homebrew/cmd/reinstall.rb
+++ b/Library/Homebrew/cmd/reinstall.rb
@@ -42,7 +42,7 @@ module Homebrew
     fi.link_keg           ||= keg_was_linked if keg_had_linked_opt
     fi.prelude
 
-    oh1 "Reinstalling #{f.full_name} #{options.to_a.join " "}"
+    oh1 "Reinstalling #{Formatter.identifier(f.full_name)} #{options.to_a.join " "}"
 
     fi.install
     fi.finish
diff --git a/Library/Homebrew/cmd/unpack.rb b/Library/Homebrew/cmd/unpack.rb
index 51c2b59f0..aee4ea2eb 100644
--- a/Library/Homebrew/cmd/unpack.rb
+++ b/Library/Homebrew/cmd/unpack.rb
@@ -36,7 +36,7 @@ module Homebrew
         rm_rf stage_dir
       end
 
-      oh1 "Unpacking #{f.full_name} to: #{stage_dir}"
+      oh1 "Unpacking #{Formatter.identifier(f.full_name)} to: #{stage_dir}"
 
       ENV["VERBOSE"] = "1" # show messages about tar
       f.brew do
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index 401a02e67..debd5eea2 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -127,7 +127,7 @@ module Homebrew
     end
     fi.prelude
 
-    oh1 "Upgrading #{f.full_specified_name} #{fi.options.to_a.join " "}"
+    oh1 "Upgrading #{Formatter.identifier(f.full_specified_name)} #{fi.options.to_a.join " "}"
 
     # first we unlink the currently active keg for this formula otherwise it is
     # possible for the existing build to interfere with the build we are about to
diff --git a/Library/Homebrew/requirements/xcode_requirement.rb b/Library/Homebrew/requirements/xcode_requirement.rb
index 9396b0df7..6cb7d45d7 100644
--- a/Library/Homebrew/requirements/xcode_requirement.rb
+++ b/Library/Homebrew/requirements/xcode_requirement.rb
@@ -22,7 +22,7 @@ class XcodeRequirement < Requirement
       A full installation of Xcode.app#{version} is required to compile this software.
       Installing just the Command Line Tools is not sufficient.
     EOS
-    if Version.new(MacOS::Xcode.latest_version) < Version.new(@version)
+    if @version && Version.new(MacOS::Xcode.latest_version) < Version.new(@version)
       message + <<~EOS
         Xcode#{version} cannot be installed on macOS #{MacOS.version}.
         You must upgrade your version of macOS.
diff --git a/Library/Homebrew/utils/git.rb b/Library/Homebrew/utils/git.rb
index f1113af66..ac17967c5 100644
--- a/Library/Homebrew/utils/git.rb
+++ b/Library/Homebrew/utils/git.rb
@@ -50,7 +50,7 @@ module Utils
     # we cannot install brewed git if homebrew/core is unavailable.
     if CoreTap.instance.installed?
       begin
-        oh1 "Installing git"
+        oh1 "Installing #{Formatter.identifier("git")}"
         safe_system HOMEBREW_BREW_FILE, "install", "git"
       rescue
         raise "Git is unavailable"