mirror of
https://github.com/vmware-tanzu/pinniped.git
synced 2026-04-15 07:06:45 +00:00
update previous commit for more log output
This commit is contained in:
@@ -55,12 +55,15 @@ 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
|
||||
echo "Comparing local changes to remote branch..."
|
||||
# Check if our local changes are different from what is already on the remote branch.
|
||||
stagedAndUnstagedDiffs=$(git --no-pager diff 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
|
||||
else
|
||||
echo "Local and remote had diffs:"
|
||||
echo "$stagedAndUnstagedDiffs"
|
||||
fi
|
||||
# Stash our changes before using git checkout and git reset, which both can throw away local changes.
|
||||
git status
|
||||
|
||||
Reference in New Issue
Block a user