Quick update to readme

Merge branch 'release/1.12.4'

AUTHORS

@@ -20,13 +20,17 @@ Fred Condo
 Alexandre Dutra
 Andreas Heiduk
 Ben Loveridge
+ChrisjStone
 Florian Gamböck
 Gergely Nagy
 JP Toto
 Kiall Mac Innes
 Lorin Hochstein
+Luis Fernando Gomes
 Olivier Mengué
 Oppodelldog
+Pokey Rule
+Silas Palmer
 Stefan Näwe
 Adam Gibbins
 Alexander Groß
@@ -35,8 +39,10 @@ Alexander Zeitler
 Brian St. Pierre
 Cararus Eugeniu
 Chad Walker
+Chris Stone
 Craig Fowler
 Emre Berge Ergenekon
+Gene Pavlovsky
 Gregor A. Cieslak
 Gruen Christian-Rolf (Kiki)
 Guillaume-Jean Herbiet
@@ -55,6 +61,7 @@ Justin Penney
 Konstantin Tjuterev
 Kridsada Thanabulpong
 Leonardo Giordani
+Luca Orlandi
 Mark Borcherding
 Mark Derricutt
 Mateusz Kaczmarek
@@ -63,12 +70,12 @@ Mayerber Carvalho Neto
 Nowell Strite
 Opher Vishnia
 Peter Schröder
-Pokey Rule
 Stefan Schüßler
 Steffen Jaeckel
 Steve Mao
 Steve Streeting
 Tacit Sawk
+Tiscs
 Vedang Manerikar
 Zheeeng
 eddie cianci

CHANGELOG.md

@@ -40,6 +40,9 @@
 
 # Changelog
 
+#### 1.12.4-dev0
+* Preparation for next release
+
 #### 1.12.3
 * Explicitly get the default values from the system and global config.
 

README.md

@@ -24,7 +24,7 @@ A quick cheatsheet was made by Daniel Kummer:
 
 ## Installing git-flow
 
-See the Wiki for up-to-date [Installation Instructions](https://github.com/petervanderdoes/gitflow-avh/wiki/Installation).
+See the Wiki for up-to-date [Installation Instructions](https://github.com/CJ-Systems/gitflow-cjs/wiki/Installation).
 
 
 ## Integration with your shell
@@ -40,7 +40,7 @@ for the commands not found in the original git-flow.
 
 ## FAQ
 
-* See the [FAQ](http://github.com/petervanderdoes/gitflow-avh/wiki/FAQ) section
+* See the [FAQ](https://github.com/CJ-Systems/gitflow-cjs/wiki/FAQ) section
 of the project Wiki.
 * Version Numbering Scheme.  
 Starting with version 1.0, the project uses the following scheme:
@@ -51,7 +51,7 @@ Starting with version 1.0, the project uses the following scheme:
 
 This project is under constant development. Feedback and suggestions are very
 welcome and I encourage you to use the [Issues
-list](http://github.com/petervanderdoes/gitflow-avh/issues) on Github to provide that
+list](https://github.com/CJ-Systems/gitflow-cjs/issues) on Github to provide that
 feedback.
 
 Feel free to fork this repository and to commit your additions. For a list of
@@ -231,14 +231,3 @@ the command.
 The files should be placed in .git/hooks  
 In the directory hooks you can find examples of all the hooks available.
 
-## Showing your appreciation
-
-Of course, the best way to show your appreciation for the git-flow tool itself
-remains contributing to the community.  If you'd like to show your appreciation
-in another way, however, consider donating through PayPal:
-
-[![PayPal][2]][1]
-
-[1]: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=S85FXJ9EBHAF2&lc=US&item_name=gitflow&item_number=gitflow&no_note=0&cn=Add%20special%20instructions%20to%20the%20seller&no_shipping=1&rm=1&return=https%3a%2f%2fgithub%2ecom%2fpetervanderdoes%2fgitflow&cancel_return=https%3a%2f%2fgithub%2ecom%2fpetervanderdoes%2fgitflow&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted
-
-[2]: https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif

git-flow-release

@@ -104,12 +104,15 @@ _finish_from_develop() {
 	# but the merge into master was successful, we skip it now
 	if ! git_is_branch_merged_into "$BRANCH" "$MASTER_BRANCH"; then
 			git_do checkout "$MASTER_BRANCH" || die "Could not check out branch '$MASTER_BRANCH'."
+
+			opts=""
+			noflag edit && opts="$opts --no-edit"
 			if noflag squash; then
-				git_do merge --no-ff "$BRANCH" || die "There were merge conflicts." # TODO: What do we do now?
+				git_do merge --no-ff $opts "$BRANCH" || die "There were merge conflicts." # TODO: What do we do now?
 			else
-				git_do merge --squash "$BRANCH" || die "There were merge conflicts." # TODO: What do we do now?
+				git_do merge --squash $opts "$BRANCH" || die "There were merge conflicts." # TODO: What do we do now?
 				flag squash_info && gitflow_create_squash_message "Merged release branch '$BRANCH'" "$MASTER_BRANCH" "$BRANCH" > "$DOT_GIT_DIR/SQUASH_MSG"
-				git_do commit
+				git_do commit $opts
 			fi
 	fi
 
@@ -131,6 +134,12 @@ _finish_from_develop() {
 				opts="$opts -m '$FLAGS_message'"
 			fi
 			[ "$FLAGS_messagefile" != "" ] && opts="$opts -F '$FLAGS_messagefile'"
+			if noflag edit; then
+				if [ "$FLAGS_message" = "" ] && [ "$FLAGS_messagefile" = "" ]; then
+					# in order to fix annotated tag without message
+					opts="$opts -m $VERSION_PREFIX$TAGNAME"
+				fi
+			fi
 			eval git_do tag $opts "$VERSION_PREFIX$TAGNAME" || die "Tagging failed. Please run finish again to retry."
 		fi
 	fi
@@ -150,6 +159,8 @@ _finish_from_develop() {
 		if ! git_is_branch_merged_into "$merge_branch" "$DEVELOP_BRANCH"; then
 			git_do checkout "$DEVELOP_BRANCH" || die "Could not check out branch '$DEVELOP_BRANCH'."
 
+			opts=""
+			noflag edit && opts="$opts --no-edit"
 			if noflag nobackmerge; then
 				# Accounting for 'git describe', if a release is tagged
 				# we use the tag commit instead of the branch.
@@ -158,15 +169,15 @@ _finish_from_develop() {
 				else
 					commit="$MASTER_BRANCH"
 				fi
-				git_do merge --no-ff "$commit" || die "There were merge conflicts." # TODO: What do we do now?
+				git_do merge --no-ff $opts "$commit" || die "There were merge conflicts." # TODO: What do we do now?
 			else
 				commit="$BRANCH"
 				if noflag squash; then
-					git_do merge --no-ff "$commit" || die "There were merge conflicts." # TODO: What do we do now?
+					git_do merge --no-ff $opts "$commit" || die "There were merge conflicts." # TODO: What do we do now?
 				else
-					git_do merge --squash "$commit" || die "There were merge conflicts." # TODO: What do we do now?
+					git_do merge --squash $opts "$commit" || die "There were merge conflicts." # TODO: What do we do now?
 					flag squash_info && gitflow_create_squash_message "Merged release branch '$BRANCH'" "$DEVELOP_BRANCH" "$BRANCH" > "$DOT_GIT_DIR/SQUASH_MSG"
-					git_do commit
+					git_do commit $opts
 				fi
 			fi
 		fi
@@ -325,6 +336,12 @@ _finish_base() {
 				opts="$opts -m '$FLAGS_message'"
 			fi
 			[ "$FLAGS_messagefile" != "" ] && opts="$opts -F '$FLAGS_messagefile'"
+			if noflag edit; then
+				if [ "$FLAGS_message" = "" ] && [ "$FLAGS_messagefile" = "" ]; then
+					# in order to fix annotated tag without message
+					opts="$opts -m $VERSION_PREFIX$TAGNAME"
+				fi
+			fi
 			eval git_do tag $opts "$VERSION_PREFIX$TAGNAME" || die "Tagging failed. Please run finish again to retry."
 		fi
 	fi
@@ -603,7 +620,7 @@ v,verbose!           Verbose (more) output
 
 cmd_finish() {
 	OPTIONS_SPEC="\
-git flow release finish [-h] [-F] [-s] [-u] [-m | -f] [-p] [-k] [-n] [-b] [-S] <version>
+git flow release finish [-h] [-F] [-s] [-u] [-m | -f] [-p] [-k] [-n] [-b] [-S] [-e] <version>
 
 
 Finish a release branch
@@ -627,6 +644,7 @@ n,[no]tag           Don't tag this release
 b,[no]nobackmerge   Don't back-merge master, or tag if applicable, in develop
 S,[no]squash        Squash release during merge
 [no]ff-master       Fast forward master branch if possible
+e,[no]edit          The --noedit option can be used to accept the auto-generated message on merging
 T,tagname!          Use given tag name
 nodevelopmerge!  Don't back-merge develop branch
 "
@@ -649,6 +667,7 @@ nodevelopmerge!  Don't back-merge develop branch
 	DEFINE_boolean 'squash' false "squash release during merge" S
 	DEFINE_boolean 'squash-info' false "add branch info during squash"
 	DEFINE_boolean 'ff-master' false "fast forward master branch if possible"
+	DEFINE_boolean 'edit' true "accept the auto-generated message on merging" e
 	DEFINE_string  'tagname' "" "use the given tag name" T
 	DEFINE_boolean 'nodevelopmerge' false "don't merge $BRANCH into $DEVELOP_BRANCH "
 

git-flow-version

@@ -37,7 +37,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-GITFLOW_VERSION=1.12.3
+GITFLOW_VERSION=1.12.4
 
 initialize() {
 	# A function can not be empty. Comments count as empty.