bin/bump-version.sh in docman-0.0.35 vs bin/bump-version.sh in docman-0.0.36
- old
+ new
@@ -13,10 +13,11 @@
# a file called CHANGES (under the title of the new version
# number) and create a GIT tag.
git checkout master
git pull origin master
+git fetch
if [ -f VERSION ]; then
BASE_STRING=`cat VERSION`
BASE_LIST=(`echo $BASE_STRING | tr '.' ' '`)
V_MAJOR=${BASE_LIST[0]}
@@ -42,11 +43,11 @@
mv tmpfile CHANGES
git add CHANGES VERSION
git commit -m "[skip] Version bump to $INPUT_STRING"
git tag -a -m "[skip] Tagging version $INPUT_STRING" "$INPUT_STRING"
git push origin ${INPUT_STRING}
- git push
+ git push origin master
else
echo "Could not find a VERSION file"
read -p "Do you want to create a version file and start from scratch? [y]" RESPONSE
if [ "$RESPONSE" = "" ]; then RESPONSE="y"; fi
if [ "$RESPONSE" = "Y" ]; then RESPONSE="y"; fi
@@ -61,11 +62,11 @@
echo "" >> CHANGES
git add VERSION CHANGES
git commit -m "[skip] Added VERSION and CHANGES files, Version bump to 0.1.0"
git tag -a -m "[skip] Tagging version 0.1.0" "0.1.0"
git push origin --tags
- git push
+ git push origin master
fi
TAG="0.1.0"
fi
if [ -n "$1" ]; then
@@ -73,10 +74,10 @@
BRANCH="state_$1"
#git show-ref --verify --quiet "refs/heads/${BRANCH}"
git ls-remote --exit-code . origin/state_stable &> /dev/null
if [ $? == 0 ]; then
git checkout ${BRANCH}
- git pull
+ git pull origin ${BRANCH}
else
git checkout --orphan ${BRANCH}
git rm --cached -r .
git clean -f -d
fi