hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 2 Activity

handle locally existing branches

Browse Source
This commit is contained in:
Michael Hoennig 2024-09-26 14:20:37 +02:00
parent 0675918362
commit 1af213a95a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/git-pull-and-if-origin-changed-run-tests
View File

@ -10,8 +10,14 @@ while true; do
if [ -n "$branch_with_new_commits" ]; then if [ -n "$branch_with_new_commits" ]; then
echo "checking out branch: $branch_with_new_commits" echo "checking out branch: $branch_with_new_commits"
echo "git checkout -b \"$branch_with_new_commits\" \"origin/$branch_with_new_commits\"" if git show-ref --quiet --heads "$branch_with_new_commits"; then
git checkout -b "$branch_with_new_commits" "origin/$branch_with_new_commits" echo "Branch $branch_with_new_commits already exists. Checking it out and pulling latest changes."
git checkout "$branch_with_new_commits"
git pull origin "$branch_with_new_commits"
else
echo "Creating and checking out new branch: $branch_with_new_commits"
git checkout -b "$branch_with_new_commits" "origin/$branch_with_new_commits"
fi
echo "building ..." echo "building ..."
./gradlew test ./gradlew test