Merge branch 'develop' into JamesSkemp-patch-1-1

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,7 +61,7 @@ Justin Penney
 Konstantin Tjuterev
 Kridsada Thanabulpong
 Leonardo Giordani
-Luis Fernando Gomes @luiscoms
+Luca Orlandi
 Mark Borcherding
 Mark Derricutt
 Mateusz Kaczmarek
@@ -64,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

LICENSE

@@ -1,12 +1,13 @@
-This software is forked of the original git-flow, see License #2.
+This software is forked of the original git-flow-AVH, see License #2.
+Which in turn is a fork of the original get-flow, see License #3
 License #1 is added to reflect the changes made.
 
-gitflow-shFlags is released under LGPL, see License #3
+gitflow-shFlags is released under LGPL, see License #4
 
 ************************************************************
 
 LICENSE #1:
-Copyright (c) 2012-2019 Peter van der Does
+Copyright (c) 2023 Chris Stone
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -29,9 +30,38 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+************************************************************
+
+
 ************************************************************
 
 LICENSE #2:
+Copyright (c) 2012-2019 Peter van der Does
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+************************************************************
+
+LICENSE #3:
 Copyright 2010 Vincent Driessen. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -61,7 +91,7 @@ either expressed or implied, of Vincent Driessen.
 
 ************************************************************
 
-LICENSE #3:
+LICENSE #4:
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 

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](https://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](https://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,3 +231,12 @@ 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:
+
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/donate/?hosted_button_id=GU25NCHMVMT9U)
+

git-flow-bugfix

@@ -109,15 +109,15 @@ v,verbose   Verbose (more) output
 	width=$(($width+3-${#PREFIX}))
 
 	for branch in $bugfix_branches; do
-		base=$(git merge-base "$branch" "$DEVELOP_BRANCH")
-		develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
-		branch_sha=$(git rev-parse "$branch")
 		if [ "$branch" = "$current_branch" ]; then
 			printf "* "
 		else
 			printf "  "
 		fi
 		if flag verbose; then
+			base=$(git merge-base "$branch" "$DEVELOP_BRANCH")
+			develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
+			branch_sha=$(git rev-parse "$branch")
 			printf "%-${width}s" "${branch#$PREFIX}"
 			if [ "$branch_sha" = "$develop_sha" ]; then
 				printf "(no commits yet)"

git-flow-feature

@@ -109,15 +109,15 @@ v,verbose   Verbose (more) output
 	width=$(($width+3-${#PREFIX}))
 
 	for branch in $feature_branches; do
-		base=$(git merge-base "$branch" "$DEVELOP_BRANCH")
-		develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
-		branch_sha=$(git rev-parse "$branch")
 		if [ "$branch" = "$current_branch" ]; then
 			printf "* "
 		else
 			printf "  "
 		fi
 		if flag verbose; then
+			base=$(git merge-base "$branch" "$DEVELOP_BRANCH")
+			develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
+			branch_sha=$(git rev-parse "$branch")
 			printf "%-${width}s" "${branch#$PREFIX}"
 			if [ "$branch_sha" = "$develop_sha" ]; then
 				printf "(no commits yet)"

git-flow-hotfix

@@ -105,15 +105,15 @@ v,verbose!        Verbose (more) output
 	width=$(($width+3-${#PREFIX}))
 
 	for branch in $hotfix_branches; do
-		base=$(git merge-base "$branch" "$MASTER_BRANCH")
-		master_sha=$(git rev-parse "$MASTER_BRANCH")
-		branch_sha=$(git rev-parse "$branch")
 		if [ "$branch" = "$current_branch" ]; then
 			printf "* "
 		else
 			printf "  "
 		fi
 		if flag verbose; then
+			base=$(git merge-base "$branch" "$MASTER_BRANCH")
+			master_sha=$(git rev-parse "$MASTER_BRANCH")
+			branch_sha=$(git rev-parse "$branch")
 			printf "%-${width}s" "${branch#$PREFIX}"
 			if [ "$branch_sha" = "$master_sha" ]; then
 				printf "(no commits yet)"

git-flow-release

@@ -494,15 +494,15 @@ v,verbose!        verbose (more) output
 	width=$(($width+3-${#PREFIX}))
 
 	for branch in $release_branches; do
-		base=$(git merge-base "$branch" "$DEVELOP_BRANCH")
-		develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
-		branch_sha=$(git rev-parse "$branch")
 		if [ "$branch" = "$current_branch" ]; then
 			printf "* "
 		else
 			printf "  "
 		fi
 		if flag verbose; then
+			base=$(git merge-base "$branch" "$DEVELOP_BRANCH")
+			develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
+			branch_sha=$(git rev-parse "$branch")
 			printf "%-${width}s" "${branch#$PREFIX}"
 			if [ "$branch_sha" = "$develop_sha" ]; then
 				printf "(no commits yet)"

git-flow-support

@@ -103,15 +103,15 @@ v,verbose         Verbose (more) output
 	width=$(($width+3-${#PREFIX}))
 
 	for branch in $support_branches; do
-		base=$(git merge-base "$branch" "$MASTER_BRANCH")
-		master_sha=$(git rev-parse "$MASTER_BRANCH")
-		branch_sha=$(git rev-parse "$branch")
 		if [ "$branch" = "$current_branch" ]; then
 			printf "* "
 		else
 			printf "  "
 		fi
 		if flag verbose; then
+			base=$(git merge-base "$branch" "$MASTER_BRANCH")
+			master_sha=$(git rev-parse "$MASTER_BRANCH")
+			branch_sha=$(git rev-parse "$branch")
 			printf "%-${width}s" "${branch#$PREFIX}"
 			if [ "$branch_sha" = "$master_sha" ]; then
 				printf "(no commits yet)"

git-flow-version

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