mirrors/bonfire-app
1
0
Fork 0
mirror of https://github.com/bonfire-networks/bonfire-app.git synced 2024-05-18 00:52:40 +00:00
Code Issues Projects Releases Wiki Activity

git push optional

Browse source
This commit is contained in:
Mayel de Borniol 2022-01-17 20:15:26 +13:00
parent cb5a6dc313
commit 8abcf1f0a9
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
git-publish.sh
View file

@ -24,13 +24,19 @@ then
# if there are changes, commit them (needed before being able to rebase)
git diff-index --quiet HEAD || git commit --verbose --all || echo Skipped...
if [[ $2 == 'pull' ]]
then
git fetch
fi
# if [[ $2 == 'pull' ]]
# then
# git fetch
# fi
# merge/rebase local changes
git rebase origin && echo "Publishing changes!" && git push || fail "Please resolve conflicts before continuing."
# git rebase origin
git pull --rebase && echo "Publishing changes!" || fail "Please resolve conflicts before continuing."
if [[ $2 != 'pull' && $2 == 'maybe-pull' ]]
then
git push
fi
else
set -e
@ -44,6 +50,7 @@ else
if [[ $2 == 'maybe-pull' ]]
then
# if jungle is available and we assume fetches were already done
command -v jungle || git pull --rebase || fail "Please resolve conflicts before continuing."
# command -v jungle ||
git pull --rebase || fail "Please resolve conflicts before continuing."
fi
fi