From 72b81844ededb58df5ab9aed698ab341d1c01243 Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Wed, 26 Oct 2016 16:33:35 -0400 Subject: [PATCH] Redirect stderr output from git (shim) invocations to /dev/null. These invocations occur before we can actually automatically install git via bottle, and as such their output isn't relevant. --- Library/Homebrew/brew.sh | 4 ++-- Library/Homebrew/utils/analytics.sh | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index 6189fac845..f3bb605bb8 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -217,7 +217,7 @@ esac if [[ -z "$HOMEBREW_DEVELOPER" ]] then export HOMEBREW_GIT_CONFIG_FILE="$HOMEBREW_REPOSITORY/.git/config" - HOMEBREW_GIT_CONFIG_DEVELOPERMODE="$(git config --file="$HOMEBREW_GIT_CONFIG_FILE" --get homebrew.devcmdrun)" + HOMEBREW_GIT_CONFIG_DEVELOPERMODE="$(git config --file="$HOMEBREW_GIT_CONFIG_FILE" --get homebrew.devcmdrun 2>/dev/null)" if [[ "$HOMEBREW_GIT_CONFIG_DEVELOPERMODE" = "true" ]] then export HOMEBREW_DEV_CMD_RUN="1" @@ -231,7 +231,7 @@ elif [[ -f "$HOMEBREW_LIBRARY/Homebrew/dev-cmd/$HOMEBREW_COMMAND.sh" ]] then if [[ -z "$HOMEBREW_DEVELOPER" ]] then - git config --file="$HOMEBREW_GIT_CONFIG_FILE" --replace-all homebrew.devcmdrun true + git config --file="$HOMEBREW_GIT_CONFIG_FILE" --replace-all homebrew.devcmdrun true 2>/dev/null export HOMEBREW_DEV_CMD_RUN="1" fi HOMEBREW_BASH_COMMAND="$HOMEBREW_LIBRARY/Homebrew/dev-cmd/$HOMEBREW_COMMAND.sh" diff --git a/Library/Homebrew/utils/analytics.sh b/Library/Homebrew/utils/analytics.sh index 19b341fdc5..0f188fe9b1 100644 --- a/Library/Homebrew/utils/analytics.sh +++ b/Library/Homebrew/utils/analytics.sh @@ -7,7 +7,7 @@ migrate-legacy-uuid-file() { local analytics_uuid="$(<"$legacy_uuid_file")" if [[ -n "$analytics_uuid" ]] then - git config --file="$HOMEBREW_REPOSITORY/.git/config" --replace-all homebrew.analyticsuuid "$analytics_uuid" + git config --file="$HOMEBREW_REPOSITORY/.git/config" --replace-all homebrew.analyticsuuid "$analytics_uuid" 2>/dev/null fi rm -f "$legacy_uuid_file" fi @@ -23,8 +23,8 @@ setup-analytics() { return fi - local message_seen="$(git config --file="$git_config_file" --get homebrew.analyticsmessage)" - local analytics_disabled="$(git config --file="$git_config_file" --get homebrew.analyticsdisabled)" + local message_seen="$(git config --file="$git_config_file" --get homebrew.analyticsmessage 2>/dev/null)" + local analytics_disabled="$(git config --file="$git_config_file" --get homebrew.analyticsdisabled 2>/dev/null)" if [[ "$message_seen" != "true" || "$analytics_disabled" = "true" ]] then # Internal variable for brew's use, to differentiate from user-supplied setting @@ -32,7 +32,7 @@ setup-analytics() { return fi - HOMEBREW_ANALYTICS_USER_UUID="$(git config --file="$git_config_file" --get homebrew.analyticsuuid)" + HOMEBREW_ANALYTICS_USER_UUID="$(git config --file="$git_config_file" --get homebrew.analyticsuuid 2>/dev/null)" if [[ -z "$HOMEBREW_ANALYTICS_USER_UUID" ]] then if [[ -n "$HOMEBREW_LINUX" ]] @@ -51,7 +51,7 @@ setup-analytics() { export HOMEBREW_NO_ANALYTICS_THIS_RUN="1" return fi - git config --file="$git_config_file" --replace-all homebrew.analyticsuuid "$HOMEBREW_ANALYTICS_USER_UUID" + git config --file="$git_config_file" --replace-all homebrew.analyticsuuid "$HOMEBREW_ANALYTICS_USER_UUID" 2>/dev/null fi if [[ -n "$HOMEBREW_LINUX" ]]