From 2eb637d52f90bd8a8d9faa96bc79f5d2937f4199 Mon Sep 17 00:00:00 2001
From: Jack May <jack@solana.com>
Date: Mon, 9 Nov 2020 15:03:44 -0800
Subject: [PATCH] fix running local test-sanity (#13482)

---
 ci/test-sanity.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ci/test-sanity.sh b/ci/test-sanity.sh
index f8f392affe..cc98a2dfed 100755
--- a/ci/test-sanity.sh
+++ b/ci/test-sanity.sh
@@ -8,10 +8,16 @@ source ci/_
 (
   echo --- git diff --check
   set -x
+
+  if [[ -n $CI_BASE_BRANCH ]]
+  then branch="$CI_BASE_BRANCH"
+  else branch="master"
+  fi
+
   # Look for failed mergify.io backports by searching leftover conflict markers
   # Also check for any trailing whitespaces!
-  git fetch origin "$CI_BASE_BRANCH"
-  git diff "$(git merge-base HEAD "origin/$CI_BASE_BRANCH")..HEAD" --check --oneline
+  git fetch origin "$branch"
+  git diff "$(git merge-base HEAD "origin/$branch")" --check --oneline
 )
 
 echo