From 7b31dd606288cbd976015efde61b6a6e2eb17a38 Mon Sep 17 00:00:00 2001 From: Ben Muschol Date: Sat, 26 Aug 2017 08:25:08 -0400 Subject: [PATCH] Prefer if over unless, simplify messaging --- Library/Homebrew/diagnostic.rb | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Library/Homebrew/diagnostic.rb b/Library/Homebrew/diagnostic.rb index d5f1a61f24..8108c5da0b 100644 --- a/Library/Homebrew/diagnostic.rb +++ b/Library/Homebrew/diagnostic.rb @@ -787,19 +787,13 @@ module Homebrew end head = coretap_path.git_head - return unless head && head !~ %r{refs/heads/master} + return if head.nil? || head =~ %r{refs/heads/master} <<-EOS.undent - Suspicious #{CoreTap.instance} git head found. + Homebrew/homebrew-core is not on the master branch - With a non-standard head, your local version of Homebrew might not - have all of the changes intended for the most recent release. The - current git head is: - #{head} - - Unless you have compelling reasons, consider setting the head to - point at the master branch by running: - git checkout master + Check out the master branch by running: + git -C "$(brew --repo homebrew/core)" checkout master EOS end