From f8091a4d516bbd75775ecb7c7f1dcfd9be17a19c Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 24 Jun 2020 09:12:08 +0100
Subject: [PATCH] shims/scm: handle missing Subversion on Catalina.

Fixes https://github.com/Homebrew/brew/issues/7781
---
 Library/Homebrew/shims/scm/git | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/shims/scm/git b/Library/Homebrew/shims/scm/git
index c4e7ec5134..65ecc55237 100755
--- a/Library/Homebrew/shims/scm/git
+++ b/Library/Homebrew/shims/scm/git
@@ -137,8 +137,11 @@ fi
 path="/Applications/Xcode.app/Contents/Developer/usr/bin/$SCM_FILE"
 safe_exec "$path" "$@"
 
-path="/usr/bin/$SCM_FILE"
-[[ -z "$popup_stub" ]] && safe_exec "$path" "$@"
+if [[ -z "$popup_stub" && "$HOMEBREW_MACOS_VERSION_NUMERIC" -lt "101500" ]]
+then
+  path="/usr/bin/$SCM_FILE"
+  safe_exec "$path" "$@"
+fi
 
 echo "You must: brew install $SCM_FILE" >&2
 exit 1