From 211e8538ec1141a4ef7cc3236623bebe228aa017 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Fri, 10 Aug 2018 22:48:12 +0200 Subject: [PATCH] Set `initial_version` to `nil` when `git describe` fails. --- Library/Homebrew/brew.sh | 2 +- Library/Homebrew/cmd/update-report.rb | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index d60da9db99..6618819e64 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -59,7 +59,7 @@ HOMEBREW_VERSION="$(git -C "$HOMEBREW_REPOSITORY" describe --tags --dirty --abbr HOMEBREW_USER_AGENT_VERSION="$HOMEBREW_VERSION" if [[ -z "$HOMEBREW_VERSION" ]] then - HOMEBREW_VERSION=">=1.4.0 (shallow or no git repository)" + HOMEBREW_VERSION=">=1.7.1 (shallow or no git repository)" HOMEBREW_USER_AGENT_VERSION="1.X.Y" fi diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index 3ab40b4e1a..82509f1666 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -62,10 +62,12 @@ module Homebrew updated = true end - initial_version = Version.new(system_command!("git", - args: ["describe", "--tags", "--abbrev=0", initial_revision], - chdir: HOMEBREW_REPOSITORY, - print_stderr: false).stdout) + out, _, status = system_command("git", + args: ["describe", "--tags", "--abbrev=0", initial_revision], + chdir: HOMEBREW_REPOSITORY, + print_stderr: false) + + initial_version = Version.new(out) if status.success? updated_taps = [] Tap.each do |tap| @@ -186,7 +188,7 @@ module Homebrew end def migrate_cache_entries_to_double_dashes(initial_version) - return if initial_version > "1.7.1" + return if initial_version && initial_version > "1.7.1" return if ENV.key?("HOMEBREW_DISABLE_LOAD_FORMULA")