aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McQuaid2017-12-30 17:36:37 +0000
committerMike McQuaid2017-12-30 17:36:37 +0000
commit60362605dee22d863ade2788650f26ef41d75473 (patch)
tree269af0fe737933b121ba0dbcbcd7464e54c36676
parent7f54c83911a494b592e412d2f99119530cebf458 (diff)
downloadbrew-60362605dee22d863ade2788650f26ef41d75473.tar.bz2
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.
-rwxr-xr-xLibrary/Homebrew/shims/scm/git8
1 files changed, 4 insertions, 4 deletions
diff --git a/Library/Homebrew/shims/scm/git b/Library/Homebrew/shims/scm/git
index a39c784c3..f826e1b60 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)