From 6be8689fa2b6f73be562ade033e693ac99b81e39 Mon Sep 17 00:00:00 2001
From: Jason Rhodes <jason.rhodes@elastic.co>
Date: Fri, 7 Sep 2018 11:56:34 -0400
Subject: [PATCH] Make ES clone target fall back to master

---
 src/dev/ci_setup/git_setup.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/dev/ci_setup/git_setup.sh b/src/dev/ci_setup/git_setup.sh
index b5e6902e2f258..a2337c7f50e3d 100755
--- a/src/dev/ci_setup/git_setup.sh
+++ b/src/dev/ci_setup/git_setup.sh
@@ -73,8 +73,14 @@ function checkout_sibling {
         return 0
       fi
 
-      # remove xpack_ prefix from target branch if all other options fail
+      # try removing xpack_ prefix from target branch
       cloneBranch="${PR_TARGET_BRANCH#xpack_}"
+      if clone_target_is_valid ; then
+        return 0
+      fi
+      
+      # if all else fails, use master
+      cloneBranch=master
       return 0
     }