From 60362605dee22d863ade2788650f26ef41d75473 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sat, 30 Dec 2017 17:36:37 +0000 Subject: [PATCH] scm/git: hide prefix cd failure warning. This may happen with certain checkout configurations (such as on our CI boxes). Also, rename the variables to be clearer about what they reference. --- Library/Homebrew/shims/scm/git | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/shims/scm/git b/Library/Homebrew/shims/scm/git index a39c784c3d..f826e1b608 100755 --- a/Library/Homebrew/shims/scm/git +++ b/Library/Homebrew/shims/scm/git @@ -92,11 +92,11 @@ case "$(lowercase "$SCM_FILE")" in ;; esac -brew_version="$(quiet_safe_cd "$SCM_DIR/../../../../../bin" && pwd -P)/$SCM_FILE" -safe_exec "$brew_version" "$@" +brew_prefix_version="$(quiet_safe_cd "$SCM_DIR/../../../../../bin" 2>/dev/null && pwd -P)/$SCM_FILE" +safe_exec "$brew_prefix_version" "$@" -brew_version="$(quiet_safe_cd "$SCM_DIR/../../../../bin" && pwd -P)/$SCM_FILE" -safe_exec "$brew_version" "$@" +brew_repo_version="$(quiet_safe_cd "$SCM_DIR/../../../../bin" && pwd -P)/$SCM_FILE" +safe_exec "$brew_repo_version" "$@" IFS=$'\n' for path in $(/usr/bin/which -a "$SCM_FILE" 2>/dev/null)