bin/bump-version.sh in docman-0.0.34 vs bin/bump-version.sh in docman-0.0.35
- old
+ new
@@ -10,12 +10,14 @@
# once the new version number is determined, the script will
# pull a list of changes from git history, prepend this to
# a file called CHANGES (under the title of the new version
# number) and create a GIT tag.
-set -vx
+git checkout master
+git pull origin master
+
if [ -f VERSION ]; then
BASE_STRING=`cat VERSION`
BASE_LIST=(`echo $BASE_STRING | tr '.' ' '`)
V_MAJOR=${BASE_LIST[0]}
V_MINOR=${BASE_LIST[1]}
@@ -79,10 +81,10 @@
git rm --cached -r .
git clean -f -d
fi
echo "type: tag" > info.yaml
echo "version: $TAG" >> info.yaml
- git add -A
+ git add info.yaml
if [ -n "$2" ] && [ "$2" == "skip" ]; then
git commit -m "[skip] Changed tag to: $TAG" & git push -u origin ${BRANCH}
else
git commit -m "Changed tag to: $TAG" & git push -u origin ${BRANCH}
fi