Merge branch 'release-0.0.9'

CHANGELOG.md

@@ -1,13 +1,29 @@
+## 0.0.9 (2016-08-04)
+  - 72d3fe5 2016-08-04 | Changed git log hash length (HEAD -> release-0.0.9, develop) [Ismo Vuorinen]
+  - 94cefa4 2016-08-04 | Remove merges from git log command output [Ismo Vuorinen]
+  - 2a88069 2016-08-04 | Fixed pushing [Ismo Vuorinen]
+
+## 0.0.8 (2016-08-04)
+  - 964866a 2016-08-04 | Push master and dev branches explicitly (HEAD -> release-0.0.8, develop) [Ismo Vuorinen]
+
+## 0.0.7 (2016-08-04)
+  - 9408ec3 2016-08-04 | Change pushing to do all (HEAD -> release-0.0.7, develop) [Ismo Vuorinen]
+
+## 0.0.6 (2016-08-04)
+  - 5af80c2 2016-08-04 | Ask should we push to origin, with tags (HEAD -> release-0.0.6, develop) [Ismo Vuorinen]
+
+## 0.0.5 (2016-08-04)
+  - 9ac3cdf 2016-08-04 | Final message to show we are done (HEAD -> release-0.0.5, origin/develop, develop) [Ismo Vuorinen]
+
+## 0.0.4 (2016-08-04)
+  - 865447c 2016-08-04 | Minor changes to make sure nothing strange happens when releasing (HEAD -> release-0.0.4, develop) [Ismo Vuorinen]
+
 ## 0.0.3 (2016-08-04)
-  - c23b512b808fda4c2cc9edf9f618061a553c61a6 2016-08-04 | If our changelog is missing, create one? (HEAD -> release-0.0.3, develop) [Ismo Vuorinen]
-  - e4f313a05698acdb55ec30538eab0477b26c0063 2016-08-04 | Add missing changelog file [Ismo Vuorinen]
-  - f25536b8a18cb4b46af53623b3ba89787ae7df7d 2016-08-04 | Merge branch 'release-0.0.2' (tag: 0.0.2, master) [Ismo Vuorinen]
-  - dd0341cb923241bca5e02d4b4d1a894708cf804b 2016-08-04 | Merge branch 'release-0.0.2' into develop [Ismo Vuorinen]
-  - f711b92ba293b4cb6e983d0b0cd8f2a76352c428 2016-08-04 | Merge branch 'release-0.0.1' (tag: 0.0.1) [Ismo Vuorinen]
+  - c23b512 2016-08-04 | If our changelog is missing, create one? (HEAD -> release-0.0.3, develop) [Ismo Vuorinen]
+  - e4f313a 2016-08-04 | Add missing changelog file [Ismo Vuorinen]
 
 ## 0.0.2 (2016-08-04)
-  - f711b92ba293b4cb6e983d0b0cd8f2a76352c428 2016-08-04 | Merge branch 'release-0.0.1' (tag: 0.0.1, master) [Ismo Vuorinen]
-  - 997beeebb0ba05c60590ecf96cb18fc1e58a336a 2016-08-04 | Merge branch 'release-0.0.1' into develop (HEAD -> release-0.0.2, develop) [Ismo Vuorinen]
+  - Changed date format on release header
 
 ## 0.0.1 (Elokuu 04, 2016)
   - Uncomment rest of the script

VERSION

@@ -1 +1 @@
-0.0.3
+0.0.9

release.sh

@@ -111,7 +111,7 @@ echo $NEW_VERSION > $FILE_VERSION
 
 # Create our changelog
 echo "## $NEW_VERSION ($NOW)" > tmpfile
-git log --pretty=format:"  - %H %ad | %s%d [%an]" --date=short "$BASE_STRING"...HEAD >> tmpfile
+git log --pretty=format:"  - %h %ad | %s%d [%an]" --date=short --no-merges "$BASE_STRING"...HEAD >> tmpfile
 echo "" >> tmpfile
 echo "" >> tmpfile
 cat $FILE_CHANGELOG >> tmpfile
@@ -121,6 +121,9 @@ echo -e "$ADJUSTMENTS_MSG"
 read
 echo -e "$PUSHING_MSG"
 
+# Make sure changes have been added
+git add $FILE_VERSION $FILE_CHANGELOG
+
 # Commit version number increment
 git commit -am "Incrementing version number to $NEW_VERSION"
 
@@ -129,7 +132,7 @@ git checkout $BRANCH_MASTER
 git merge --no-ff $BRANCH_RELEASE
 
 # Create tag for new version from -master
-git tag $NEW_VERSION
+git tag -am "Tag version ${NEW_VERSION}." "$NEW_VERSION"
 
 # Merge release branch with the new version number back into develop
 git checkout $BRANCH_DEV
@@ -137,3 +140,12 @@ git merge --no-ff $BRANCH_RELEASE
 
 # Remove release branch
 git branch -d $BRANCH_RELEASE
+
+echo -ne "${QUESTION_FLAG} ${CYAN}Push?"
+
+read PUSH
+if [[ $PUSH =~ [yY](es)* ]] || [ "$PUSH" = "" ]; then
+    git push --all origin
+fi
+
+echo -e "${NOTICE_FLAG} Done!"