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