Merge pull request #3201 from MikeMcQuaid/git-coretap-tests

utils/git: don't fail when CoreTap is untapped.
This commit is contained in:
Mike McQuaid 2017-09-23 22:06:10 +01:00 committed by GitHub
commit a5b37e3b44

View File

@ -49,14 +49,14 @@ module Utils
return if git_available? return if git_available?
# we cannot install brewed git if homebrew/core is unavailable. # we cannot install brewed git if homebrew/core is unavailable.
raise "Git is unavailable" unless CoreTap.instance.installed? if CoreTap.instance.installed?
begin begin
oh1 "Installing git" oh1 "Installing git"
safe_system HOMEBREW_BREW_FILE, "install", "git" safe_system HOMEBREW_BREW_FILE, "install", "git"
rescue rescue
raise "Git is unavailable" raise "Git is unavailable"
end end
end
clear_git_available_cache clear_git_available_cache
raise "Git is unavailable" unless git_available? raise "Git is unavailable" unless git_available?