Merge branch 'release/1.10.2'

Author: petervanderdoes

AUTHORS

@@ -35,6 +35,7 @@ Cararus Eugeniu
 Chad Walker
 Craig Fowler
 Emre Berge Ergenekon
+Gregor A. Cieslak
 Gruen Christian-Rolf (Kiki)
 Guillaume-Jean Herbiet
 James Moran

Changes.mdown

@@ -28,6 +28,10 @@
 
 # Changelog
 
+#### 1.10.2
+[Peter van der Does][petervanderdoes]
+* Bugfix: Error finishing a release.
+
 #### 1.10.1
 [Peter van der Does][petervanderdoes]
 * Bugfix: flag short name (p) already defined

README.mdown

@@ -109,7 +109,7 @@ preferably in a Github fork, of course.
 
 To initialize a new repo with the basic branch structure, use:
 
-		git flow init [-d]
+    git flow init [-d]
 
 This will then interactively prompt you with some questions on which branches
 you would like to use as development and production branches, and how you
@@ -124,40 +124,40 @@ The ``-d`` flag will accept all defaults.
 
 * To list/start/finish/delete feature branches, use:
 
-  		git flow feature
-  		git flow feature start <name> [<base>]
-  		git flow feature finish <name>
-  		git flow feature delete <name>
+        git flow feature
+        git flow feature start <name> [<base>]
+        git flow feature finish <name>
+        git flow feature delete <name>
 
   For feature branches, the `<base>` arg must be a branch, when omitted it defaults to the develop branch.
 
 * To push/pull a feature branch to the remote repository, use:
 
-  		git flow feature publish <name>
-		  git flow feature track <name>
+        git flow feature publish <name>
+        git flow feature track <name>
 
 * To list/start/finish/delete release branches, use:
 
-  		git flow release
-  		git flow release start <release> [<base>]
-  		git flow release finish <release>
-  		git flow release delete <release>
+        git flow release
+        git flow release start <release> [<base>]
+        git flow release finish <release>
+        git flow release delete <release>
 
   For release branches, the `<base>` arg must be a branch, when omitted it defaults to the develop branch.
 
 * To list/start/finish/delete hotfix branches, use:
 
-  		git flow hotfix
-  		git flow hotfix start <release> [<base>]
-  		git flow hotfix finish <release>
-  		git flow hotfix delete <release>
+        git flow hotfix
+        git flow hotfix start <release> [<base>]
+        git flow hotfix finish <release>
+        git flow hotfix delete <release>
 
   For hotfix branches, the `<base>` arg must be a branch, when omitted it defaults to the production branch.
 
 * To list/start support branches, use:
 
-  		git flow support
-  		git flow support start <release> <base>
+        git flow support
+        git flow support start <release> <base>
 
   For support branches, the `<base>` arg must be a branch, when omitted it defaults to the production branch.
 
@@ -167,21 +167,21 @@ You can easily publish a feature you are working on. The reason can be to allow
 
 When you want to publish a feature just use:
 
-      git flow feature publish <name>
+    git flow feature publish <name>
 
 or, if you already are into the `feature/<name>` branch, just issue:
 
-      git flow feature publish
+    git flow feature publish
 
 Now if you execute `git branch -avv` you will see that your branch `feature/<name>` tracks `[origin/feature/<name>]`. To track the same remote branch in another clone of the same repository use:
 
-      git flow feature track <name>
+    git flow feature track <name>
 
 This will create a local feature `feature/<name>` that tracks the same remote branch as the original one, that is `origin/feature/<name>`.
 
 When one developer (depending on your work flow) finishes working on the feature he or she can issue `git flow feature finish <name>` and this will automatically delete the remote branch. All other developers shall then run:
 
-      git flow feature delete <name>
+    git flow feature delete <name>
 
 to get rid of the local feature that tracks a remote branch that no more exist.
 

git-flow-bugfix

@@ -604,10 +604,11 @@ showcommands!    Show git commands while executing them
 	# Parse arguments
 	parse_args "$@"
 
-	warn "The command 'git flow bugfix checkout/co' will be deprecated per version 2.0.0"
-	gitflow_require_name_arg
-
-	git_do checkout "$BRANCH"  || die "Could not check out branch '$BRANCH'."
+	NAME=$(gitflow_resolve_nameprefix "$NAME" "$PREFIX")
+	if [ $? -eq 0 ]; then
+		BRANCH=$PREFIX$NAME
+		git_do checkout "$BRANCH"  || die "Could not check out branch '$BRANCH'."
+	fi
 }
 
 cmd_co() {

git-flow-feature

@@ -612,10 +612,11 @@ showcommands!    Show git commands while executing them
 	# Parse arguments
 	parse_args "$@"
 
-	warn "The command 'git flow feature checkout/co' will be deprecated per version 2.0.0"
-	gitflow_require_name_arg
-
-	git_do checkout "$BRANCH"  || die "Could not check out branch '$BRANCH'."
+	NAME=$(gitflow_resolve_nameprefix "$NAME" "$PREFIX")
+	if [ $? -eq 0 ]; then
+		BRANCH=$PREFIX$NAME
+		git_do checkout "$BRANCH"  || die "Could not check out branch '$BRANCH'."
+	fi
 }
 
 cmd_co() {

git-flow-release

@@ -56,7 +56,7 @@ _finish_from_develop() {
 		require_branches_equal "$BRANCH" "$ORIGIN/$BRANCH"
 	fi
 	if git_remote_branch_exists "$ORIGIN/$MASTER_BRANCH"; then
-		if flag ff-master; then
+		if flag ff_master; then
 			git_compare_refs "$MASTER_BRANCH" "$ORIGIN/$MASTER_BRANCH"
 			compare_refs_result=$?
 

git-flow-version

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

gitflow-common

@@ -342,7 +342,7 @@ gitflow_resolve_nameprefix() {
 	num_matches=$(echo "$matches" | wc -l)
 	if [ -z "$matches" ]; then
 		# no prefix match, so take it literally
-		warn "No branch matches prefix '$name'"
+		warn "No branches match '$prefix$name*'"
 		return 1
 	else
 		if [ $num_matches -eq 1 ]; then