Skip to content

Commit

Permalink
fix: point newly cloned ecommerce repos to use 2u/main branch (#8)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
christopappas authored May 2, 2024
1 parent 1179c53 commit 2d68f17
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 2d68f17

Please sign in to comment.