From 7aeb2c3cdeaeaf0f738362c892d68c3f8e4243c6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travisr@matrix.org>
Date: Mon, 28 Mar 2022 14:26:03 -0600
Subject: [PATCH] Step 10.4: Fix end-to-end test branch matching

---
 scripts/fetchdep.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/fetchdep.sh b/scripts/fetchdep.sh
index 15e998ddbe..5d2e65c284 100755
--- a/scripts/fetchdep.sh
+++ b/scripts/fetchdep.sh
@@ -57,7 +57,10 @@ BRANCH_ARRAY=(${head//:/ })
 TRY_ORG=$deforg
 TRY_BRANCH=${BRANCH_ARRAY[0]}
 if [[ "$head" == *":"* ]]; then
-    TRY_ORG=${BRANCH_ARRAY[0]}
+    # ... but only match that fork if it's a real fork
+    if [ "${BRANCH_ARRAY[0]}" != "matrix-org" ]; then
+        TRY_ORG=${BRANCH_ARRAY[0]}
+    fi
     TRY_BRANCH=${BRANCH_ARRAY[1]}
 fi
 clone ${TRY_ORG} $defrepo ${TRY_BRANCH}