CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak mfpub stashing

Browse Source
This commit is contained in:
Scott Lahteine 2020-01-22 01:54:25 -06:00
parent fd346c6cd1
commit 0eae26a7be
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildroot/share/git/mfpub
View File

@ -33,9 +33,9 @@ fi
# Check out the named branch (or stay in current) # Check out the named branch (or stay in current)
if [[ $BRANCH != $CURR ]]; then if [[ $BRANCH != $CURR ]]; then
git checkout $BRANCH
echo "Stashing any changes to files..." echo "Stashing any changes to files..."
[[ $(git stash) != "No local "* ]] && HAS_STASH=1 [[ $(git stash) != "No local "* ]] && HAS_STASH=1
git checkout $BRANCH
fi fi
COMMIT=$( git log --format="%H" -n 1 ) COMMIT=$( git log --format="%H" -n 1 )
@ -135,4 +135,4 @@ git push -f upstream | {
rm -rf ${TMPFOLDER} rm -rf ${TMPFOLDER}
# Go back to the branch we started from # Go back to the branch we started from
[[ $BRANCH != $CURR ]] && { git checkout $BRANCH ; [[ $HAS_STASH == 1 ]] && git stash pop ; } [[ $BRANCH != $CURR ]] && git checkout $BRANCH && [[ $HAS_STASH == 1 ]] && git stash pop