mirrors/pinniped
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/pinniped.git synced 2026-07-24 00:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avoid force pushing to pinny/bump-deps when there are no new changes

Browse Source
This commit is contained in:
Ryan Richard
2026-03-06 08:49:07 -08:00
parent 51e724b6d8
commit cd1b52231f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pipelines/shared-tasks/create-or-update-pr/task.sh
+9 -2
View File
@@ -53,11 +53,18 @@ if [[ -z "$(git ls-remote https_origin "$BRANCH")" ]]; then
new_branch="yes"
else
echo "The branch already exists, so pull it."
# Fetch all the remote branches so we can use one of them.
git fetch https_origin
# Check if our local changes are different from what is already on the remote branch.
stagedAndUnstagedDiffs=$(git diff --no-pager https_origin/"$BRANCH")
if [[ "$stagedAndUnstagedDiffs" == "" ]]; then
# The changes that we made locally are the same as what is already on the branch.
echo "Local git changes are the same as what is already on remote branch $BRANCH. Done."
exit 0
fi
# Stash our changes before using git checkout and git reset, which both can throw away local changes.
git status
git stash
# Fetch all the remote branches so we can use one of them.
git fetch https_origin
# The branch already exists, so reuse it.
git checkout "$BRANCH"
# Pull to sync up commits with the remote branch.