From 2d68f17b722a535494ca391d540bebb4cdfebcd6 Mon Sep 17 00:00:00 2001
From: Chris Pappas <christopappas@users.noreply.github.com>
Date: Thu, 2 May 2024 13:45:38 -0400
Subject: [PATCH] fix: point newly cloned ecommerce repos to use 2u/main branch
 (#8)

* fix: point newly cloned ecommerce repos to use 2u/main branch

* feat: make repeat runs of make dev.clone update from 2u/main for ecommerce
---
 repo.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/repo.sh b/repo.sh
index aef06c9c64..17e9d54e6f 100755
--- a/repo.sh
+++ b/repo.sh
@@ -103,7 +103,7 @@ _checkout ()
         # If a directory exists and it is nonempty, assume the repo has been cloned.
         if [ -d "$name" ] && [ -n "$(ls -A "$name" 2>/dev/null)" ]; then
             cd "$name"
-            _checkout_and_update_branch
+            _checkout_and_update_branch "${repo}"
             cd ..
         fi
     done
@@ -134,11 +134,13 @@ _clone ()
             fi
             printf "The [%s] repo is already checked out. Checking for updates.\n" "$name"
             cd "${DEVSTACK_WORKSPACE}/${name}"
-            _checkout_and_update_branch
+            _checkout_and_update_branch "${repo}"
             cd ..
         else
             if [ -n "${OPENEDX_GIT_BRANCH:-}" ]; then
                 CLONE_BRANCH="-b ${OPENEDX_GIT_BRANCH}"
+            elif [[ "${repo}" == *"openedx/ecommerce"* ]]; then
+                CLONE_BRANCH="-b 2u/main"
             else
                 CLONE_BRANCH=""
             fi
@@ -154,10 +156,13 @@ _clone ()
 
 _checkout_and_update_branch ()
 {
+    local current_repo=$1
     GIT_SYMBOLIC_REF="$(git symbolic-ref HEAD 2>/dev/null)"
     BRANCH_NAME=${GIT_SYMBOLIC_REF##refs/heads/}
     if [ -n "${OPENEDX_GIT_BRANCH}" ]; then
         CHECKOUT_BRANCH=${OPENEDX_GIT_BRANCH}
+    elif [[ "${current_repo}" == *"openedx/ecommerce"* ]]; then
+        CHECKOUT_BRANCH="2u/main"
     else
         CHECKOUT_BRANCH=$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@')
     fi