From 8c21c0e59037f7bcd744f9549d47baf88f1742db Mon Sep 17 00:00:00 2001 From: James Skemp Date: Sat, 10 Jun 2023 14:50:48 -0500 Subject: [PATCH 01/11] Fix redirecting links in README --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 44536e01..d3dd6a53 100644 --- a/README.md +++ b/README.md @@ -10,17 +10,17 @@ blog post"). This fork adds functionality not added to the original branch. For the best introduction to get started with `git flow`, please read Jeff Kreeftmeijer's blog post: -[http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/](http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/) +[Using git-flow to automate your git branching workflow](https://jeffkreeftmeijer.com/git-flow/) Or have a look at one of these screen casts: -* [How to use a scalable Git branching model called git-flow](http://buildamodule.com/video/change-management-and-version-control-deploying-releases-features-and-fixes-with-git-how-to-use-a-scalable-git-branching-model-called-gitflow) (by Build a Module) -* [A short introduction to git-flow](http://vimeo.com/16018419) (by Mark Derricutt) -* [On the path with git-flow](https://vimeo.com/codesherpas/on-the-path-gitflow) (by Dave Bock) +* [How to use a scalable Git branching model called git-flow](https://buildamodule.com/index.php?q=video/change-management-and-version-control-deploying-releases-features-and-fixes-with-git-how-to-use-a-scalable-git-branching-model-called-gitflow) (by Build a Module) +* [A short introduction to git-flow](https://vimeo.com/16018419) (by Mark Derricutt) +* [On the path with git-flow](https://vimeo.com/37408017) (by Dave Bock) A quick cheatsheet was made by Daniel Kummer: -[http://danielkummer.github.io/git-flow-cheatsheet/](http://danielkummer.github.io/git-flow-cheatsheet/) +[https://danielkummer.github.io/git-flow-cheatsheet/](https://danielkummer.github.io/git-flow-cheatsheet/) ## Installing git-flow @@ -29,18 +29,18 @@ See the Wiki for up-to-date [Installation Instructions](https://github.com/peter ## Integration with your shell -For those who use the [Bash](http://www.gnu.org/software/bash/) or [ZSH](http://www.zsh.org) +For those who use the [Bash](https://www.gnu.org/software/bash/) or [ZSH](https://www.zsh.org/) shell, you can use my [fork of git-flow-completion](https://github.com/petervanderdoes/git-flow-completion) which includes several additions for git-flow (AVH Edition), or you can use the -original [git-flow-completion](http://github.com/bobthecow/git-flow-completion) -project by [bobthecow](http://github.com/bobthecow). Both offer tab-completion +original [git-flow-completion](https://github.com/bobthecow/git-flow-completion) +project by [bobthecow](https://github.com/bobthecow). Both offer tab-completion for git-flow subcommands and branch names with my fork including tab-completion 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/petervanderdoes/gitflow-avh/wiki/FAQ) section of the project Wiki. * Version Numbering Scheme. Starting with version 1.0, the project uses the following scheme: @@ -51,14 +51,14 @@ 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/petervanderdoes/gitflow-avh/issues) on Github to provide that feedback. Feel free to fork this repository and to commit your additions. For a list of all contributors, please see the [AUTHORS](AUTHORS) file. Any questions, tips, or general discussion can be posted to the Google group: -[http://groups.google.com/group/gitflow-users](http://groups.google.com/group/gitflow-users) +[http://groups.google.com/group/gitflow-users](https://groups.google.com/g/gitflow-users) This is the original group set up to support the nvie branch, but I am monitoring the list as well for any questions related to my version. When you do post a question on the list please indicate which version you are, @@ -118,7 +118,7 @@ those questions to accept the (sane) default suggestions. The ``-d`` flag will accept all defaults. -![Screencast git flow init](http://i.imgur.com/lFQbY5V.gif) +![Screencast git flow init](https://i.imgur.com/lFQbY5V.gif) ### Creating feature/release/hotfix/support branches From 481e521d550ce1b0ce2214c1669325b425cd5b77 Mon Sep 17 00:00:00 2001 From: ChrisjStone Date: Sun, 11 Jun 2023 03:18:56 -0600 Subject: [PATCH 02/11] updated to current dev version --- git-flow-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-flow-version b/git-flow-version index 630f401d..38e57cf0 100644 --- a/git-flow-version +++ b/git-flow-version @@ -38,7 +38,7 @@ # -GITFLOW_VERSION=1.12.4 +GITFLOW_VERSION=1.12.5-dev0 initialize() { # A function can not be empty. Comments count as empty. From 14109a0fb5b82663b60402b1e22a03e1c8023d8e Mon Sep 17 00:00:00 2001 From: gpongelli Date: Fri, 7 Jul 2017 09:55:25 +0200 Subject: [PATCH 03/11] Speed up "list" command execution, moving time consuming operation where they are really needed. --- git-flow-bugfix | 6 +++--- git-flow-feature | 6 +++--- git-flow-hotfix | 6 +++--- git-flow-release | 6 +++--- git-flow-support | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/git-flow-bugfix b/git-flow-bugfix index e27f05cf..3988d8d5 100644 --- a/git-flow-bugfix +++ b/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)" diff --git a/git-flow-feature b/git-flow-feature index 0feeb4e6..a8b49533 100644 --- a/git-flow-feature +++ b/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)" diff --git a/git-flow-hotfix b/git-flow-hotfix index 514a5099..be4b91e1 100644 --- a/git-flow-hotfix +++ b/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)" diff --git a/git-flow-release b/git-flow-release index 88e84b78..8b02aaa3 100644 --- a/git-flow-release +++ b/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)" diff --git a/git-flow-support b/git-flow-support index 2f2c2ff5..940d8cb9 100644 --- a/git-flow-support +++ b/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)" From d68e8d8e3566dfd9d3550d6d476a63505d4ca142 Mon Sep 17 00:00:00 2001 From: James Skemp Date: Sun, 11 Jun 2023 08:56:22 -0500 Subject: [PATCH 04/11] Update Build a Module video link in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d3dd6a53..b7b0d5af 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Kreeftmeijer's blog post: Or have a look at one of these screen casts: -* [How to use a scalable Git branching model called git-flow](https://buildamodule.com/index.php?q=video/change-management-and-version-control-deploying-releases-features-and-fixes-with-git-how-to-use-a-scalable-git-branching-model-called-gitflow) (by Build a Module) +* [How to use a scalable Git branching model called git-flow](https://www.youtube.com/watch?v=-8DgENtFWSU) (by Build a Module) * [A short introduction to git-flow](https://vimeo.com/16018419) (by Mark Derricutt) * [On the path with git-flow](https://vimeo.com/37408017) (by Dave Bock) From 202f2b42c9bfa6b9e620bb79e3169bbc708f8564 Mon Sep 17 00:00:00 2001 From: Chris Stone Date: Sun, 11 Jun 2023 08:10:52 -0600 Subject: [PATCH 05/11] Update README.md Missed a couple of references to gitflow-avh --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5da350f3..78c6a032 100644 --- a/README.md +++ b/README.md @@ -69,8 +69,8 @@ using the complete version number. Fork the repository. Then, run: ```shell -git clone -b master git@github.com:/gitflow-avh.git -cd gitflow-avh +git clone -b master git@github.com:/gitflow-cjs.git +cd gitflow-cjs ``` The `-b master` switch has to be added since the fork operation automatically From a6a963d05f7498a73ef967e5ea41c699e5fe5276 Mon Sep 17 00:00:00 2001 From: Matthew Franglen Date: Mon, 5 Feb 2018 19:49:18 +0000 Subject: [PATCH 06/11] Add antigen compatible plugin description This adds antigen support for ZSH. See https://github.com/zsh-users/antigen for more details. This allows a user to start using this library using the command: ```bash antigen bundle matthewfranglen/gitflow-avh ``` Which handles downloading the repository and adding the command to your path. --- gitflow-avh.plugin.zsh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 gitflow-avh.plugin.zsh diff --git a/gitflow-avh.plugin.zsh b/gitflow-avh.plugin.zsh new file mode 100644 index 00000000..cc11850c --- /dev/null +++ b/gitflow-avh.plugin.zsh @@ -0,0 +1,23 @@ +# This allows the gitflow-avh commands to be installed in ZSH using antigen. +# Antigen is a bundle manager. It allows you to enhance the functionality of +# your zsh session by installing bundles and themes easily. + +# Antigen documentation: +# http://antigen.sharats.me/ +# https://github.com/zsh-users/antigen + +# Install gitflow-avh: +# antigen bundle petervanderdoes/gitflow-avh +# Bundles installed by antigen are available for use immediately. + +# Update gitflow-avh (and all other antigen bundles): +# antigen update + +# The antigen command will download the git repository to a folder and then +# execute an enabling script (this file). The complete process for loading the +# code is documented here: +# https://github.com/zsh-users/antigen#notes-on-writing-plugins + +# This specific script just adds the project folder to the PATH. This makes all +# commands available in git. +export PATH="${PATH}":`dirname "${0}"` From 109a55228e069f8c5462f130fe8685250b3045f5 Mon Sep 17 00:00:00 2001 From: Matthew Franglen Date: Mon, 5 Feb 2018 19:57:15 +0000 Subject: [PATCH 07/11] Suggest using master branch for stable release --- gitflow-avh.plugin.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitflow-avh.plugin.zsh b/gitflow-avh.plugin.zsh index cc11850c..f979ae51 100644 --- a/gitflow-avh.plugin.zsh +++ b/gitflow-avh.plugin.zsh @@ -7,7 +7,7 @@ # https://github.com/zsh-users/antigen # Install gitflow-avh: -# antigen bundle petervanderdoes/gitflow-avh +# antigen bundle petervanderdoes/gitflow-avh --branch=master # Bundles installed by antigen are available for use immediately. # Update gitflow-avh (and all other antigen bundles): From 1f1b2ee76b2609c645c973dbb87aaee7271e027a Mon Sep 17 00:00:00 2001 From: ChrisjStone Date: Sun, 11 Jun 2023 18:50:13 -0600 Subject: [PATCH 08/11] fix(antigen): change installed repo change download soruce from petervanderdoes/gitflow-avh to Cj-Systems/gitflow-cjs. Also have antigen pull master branch for current stable release --- gitflow-avh.plugin.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitflow-avh.plugin.zsh b/gitflow-avh.plugin.zsh index f979ae51..bd05f73a 100644 --- a/gitflow-avh.plugin.zsh +++ b/gitflow-avh.plugin.zsh @@ -6,8 +6,8 @@ # http://antigen.sharats.me/ # https://github.com/zsh-users/antigen -# Install gitflow-avh: -# antigen bundle petervanderdoes/gitflow-avh --branch=master +# Install gitflow-avh with antigen: +# antigen bundle CJ-Systems/gitflow-cjs --branch=master # Bundles installed by antigen are available for use immediately. # Update gitflow-avh (and all other antigen bundles): From 5fa89e5495fa398d0fa1c4f693aaee8581213a97 Mon Sep 17 00:00:00 2001 From: ChrisjStone Date: Sun, 11 Jun 2023 19:00:40 -0600 Subject: [PATCH 09/11] Update of the contributers. --- AUTHORS | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index 009ef627..35119a51 100644 --- a/AUTHORS +++ b/AUTHORS @@ -10,7 +10,9 @@ Peter van der Does Vincent Driessen Daniel Dehennin Benedikt Böhm +ChrisjStone Leonid Komarovsky +Chris Stone Felipe Talavera Randy Merrill Kevin Woo @@ -20,18 +22,20 @@ Fred Condo Alexandre Dutra Andreas Heiduk Ben Loveridge -ChrisjStone Florian Gamböck Gergely Nagy JP Toto +James Skemp Kiall Mac Innes Lorin Hochstein Luis Fernando Gomes +Matthew Franglen Olivier Mengué Oppodelldog Pokey Rule Silas Palmer Stefan Näwe +gpongelli Adam Gibbins Alexander Groß Alexander Norström @@ -39,7 +43,6 @@ Alexander Zeitler Brian St. Pierre Cararus Eugeniu Chad Walker -Chris Stone Craig Fowler Emre Berge Ergenekon Gene Pavlovsky @@ -80,7 +83,6 @@ Vedang Manerikar Zheeeng eddie cianci gmallard -gpongelli raybec From 52c290b3a30e32c859cbc392ae11e4cbcacb5e62 Mon Sep 17 00:00:00 2001 From: ChrisjStone Date: Sun, 11 Jun 2023 19:00:40 -0600 Subject: [PATCH 10/11] Version bump 1.12.5-dev.11 --- git-flow-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-flow-version b/git-flow-version index 38e57cf0..f25da3b5 100644 --- a/git-flow-version +++ b/git-flow-version @@ -38,7 +38,7 @@ # -GITFLOW_VERSION=1.12.5-dev0 +GITFLOW_VERSION=1.12.5-dev.11 initialize() { # A function can not be empty. Comments count as empty. From ce2ce1855fcd87796643af33aeb363105e78889e Mon Sep 17 00:00:00 2001 From: ChrisjStone Date: Sun, 11 Jun 2023 19:42:39 -0600 Subject: [PATCH 11/11] add contributions to changelog, set version to 1.12.5 for release --- CHANGELOG.md | 127 ++++++++++++++++++++++++----------------------- git-flow-version | 2 +- 2 files changed, 67 insertions(+), 62 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fc35ad7..cd9067b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,8 +40,13 @@ # Changelog +#### 1.12.5 +* Cherry-Pick Speed up "list" command execution #325 from gpongelli/gitflow-avh/tree/speedUpListCmd +* Updated readme links Thank You [JamesSkemp](https://github.com/JamesSkemp) +* Support gitflow-cjs being used as a plugin for zsh users via antigen. Thank You [matthewfranglen](https://github.com/matthewfranglen) + #### 1.12.4-dev0 -* Preparation for next release +* Preparation for first "official" release from CJ-Systems #### 1.12.3 * Explicitly get the default values from the system and global config. @@ -98,13 +103,13 @@ * Bugfix: Errors when initializing git flow and useconfigonly is set but the name and/or email has not been set. * Bugfix: Report summary on finish is incorrect. * Missing push on bugfix finish -* Allow a dirty tree when starting a hotfix/support/release branch if set to do so. +* Allow a dirty tree when starting a hotfix/support/release branch if set to do so. If the config `gitflow.allowdirty` is set to `true`, allow starting from a dirty tree. * Bugfix: Error when trying to delete a non-existent remote branch * Feature: Add rename command to bugfix/hotfix/feature [Andreas Heiduk][asheiduk] -* git flow * rebase now supports rebase.autoStash flag +* git flow * rebase now supports rebase.autoStash flag git rebase can automatically cleanup the working tree. Therefore skip the test when and where appropriate. #### 1.10.2 @@ -125,8 +130,8 @@ If the config `gitflow.allowdirty` is set to `true`, allow starting from a dirty * When finishing a release have the ability to fast-forward the master branch, if possible. This is controlled by the flag --ff-master. * Add new flag -T, --tagname to override the tag name when finishing a release or hotfix. -* Allow multiple hotfix branches by setting the config allowmultihotfix to true. - The command to set it is +* Allow multiple hotfix branches by setting the config allowmultihotfix to true. + The command to set it is [Kridsada Thanabulpong][sirn] * Fix infinite loop during Darwin link resolving. @@ -165,12 +170,12 @@ If the config `gitflow.allowdirty` is set to `true`, allow starting from a dirty #### 1.8.0 [Peter van der Does][petervanderdoes] * Add rebase action to release, hotfix and support. -* Shortcut for rebase commands. - Introduce the following new command: +* Shortcut for rebase commands. + Introduce the following new command: * git flow rebase This command will perform the action on the branch that's currently active. -* Use the base branch when doing a git flow feature diff. +* Use the base branch when doing a git flow feature diff. When doing a diff on the feature branch use the base branch which this feature originated from. It will show the committed changes. * Problem when certain variables are set before executing git-flow. @@ -192,14 +197,14 @@ If the config `gitflow.allowdirty` is set to `true`, allow starting from a dirty #### 1.7.0 [Peter van der Does][petervanderdoes] * Refactor the gitflow override flag functions. -* Shortcut for finish, delete, and publish commands. - Introduce the following new commands: +* Shortcut for finish, delete, and publish commands. + Introduce the following new commands: * git flow finish * git flow delete * git flow publish These commands will perform the action on the branch that's currently active. -* No branch is needed for the following function: +* No branch is needed for the following function: * git flow feature publish/finish/delete * git flow release publish/finish/delete * git flow hotfix publish/finish/delete @@ -214,12 +219,12 @@ If the config `gitflow.allowdirty` is set to `true`, allow starting from a dirty * Fix sanity check for release track command. [Opher Vishnia][OpherV] -* Fix feature pull. +* Fix feature pull. The pull request fails when there's no local branch with the same name as the remote branch. [Leonid Komarovsky][shpoont] -* Option for global hooks and filters directory. +* Option for global hooks and filters directory. This is only for hooks and filters related to git-flow, not the standard git hooks. @@ -230,7 +235,7 @@ If the config `gitflow.allowdirty` is set to `true`, allow starting from a dirty #### 1.6.0 [Peter van der Does][petervanderdoes] -* Add ability to short-circuit the version filters. +* Add ability to short-circuit the version filters. An exit of 127 will short-circuit the process. * Output when finishing a branch is wrong. @@ -244,7 +249,7 @@ If the config `gitflow.allowdirty` is set to `true`, allow starting from a dirty #### 1.5.3 [Peter van der Does][petervanderdoes] -* Bugfix: Error about deleting branch when using squash option. +* Bugfix: Error about deleting branch when using squash option. When using the squash option for release/feature finish, the release/feature branch is not deleted. @@ -272,21 +277,21 @@ If the config `gitflow.allowdirty` is set to `true`, allow starting from a dirty * Add default flag for flag showcommands. [Florian Gamböck][floga] -* Bugfix: Fix variable non-zero test +* Bugfix: Fix variable non-zero test Due to missing quotation marks, the -n test won't work properly, leading to always returning true and overriding variables with nothing. #### 1.5.0 [Peter van der Does][petervanderdoes] -* Add the ability to set defaults for flag. +* Add the ability to set defaults for flag. You can now set defaults for flags by setting environment variables. -* Add flag no-ff to feature finish. +* Add flag no-ff to feature finish. This gives the ability to never fast-forward a merge, even when it's only one commit. * Bugfix: Error in a long flag name for release finish * Function in gitflow-shFlags refactored to make it faster. -* Add flag --squash-info to release/feature finish. +* Add flag --squash-info to release/feature finish. When you use the flag --squash while finishing a release or feature branch, the logs don't make it clear which branch you merged. The new flag will add an extra comment to the commit message, stating which branch was used for the @@ -301,33 +306,33 @@ If the config `gitflow.allowdirty` is set to `true`, allow starting from a dirty #### 1.4.0 [Peter van der Does][petervanderdoes] -* Remember the base. +* Remember the base. With the commands feature/hotfix/release start you can give a base from which the new branch will be created. Upon finishing this branch it will - automatically merge the branch back into the base as given during the start. - If no base is given the normal functionality will be followed. + automatically merge the branch back into the base as given during the start. + If no base is given the normal functionality will be followed. With the hotfix and release, if a base is given and it's not the DEVELOP_BRANCH, the branch will *NOT* be merged back into the $DEVELOP_BRANCH upon finishing this branch. -* New config command. +* New config command. git flow config base. This can be used to set and get the base for feature/hotfix/release branches so it can be used when finishing these branches. * Get the correct working directory when the git-flow file is a symbolic link. * Don't check/compare hotfix and base branch when branch is merged already. -* Remove export POSIXLY_CORRECT. +* Remove export POSIXLY_CORRECT. Setting this environment variable can mess things up when git-flow is used in combination with other shell scripts. -* Update gitflow-shFlags from upstream. +* Update gitflow-shFlags from upstream. Besides other improvements this update eliminates the use of external system calls on a majority of systems which in theory leads to a speed increase of about 20%. -* Use GNU getopt on BSD systems. +* Use GNU getopt on BSD systems. BSD getopt doesn't support long options in commands but the GNU getopt does. [Alexandre Dutra][adutra] * Git refuses to delete local branch with "-d" if it is tracking a remote one. -* Can't always delete current release/hotfix local branch on finish +* Can't always delete current release/hotfix local branch on finish Situation can occur you are on the local branch the script wants to delete, if you are you can't delete that branch. We'll switch to the base branch when you are deleting the branch you currently are on. @@ -337,24 +342,24 @@ If the config `gitflow.allowdirty` is set to `true`, allow starting from a dirty #### 1.3.0 [Peter van der Does][petervanderdoes] -* Make name in feature publish optional. +* Make name in feature publish optional. Instead of always having to add the branch when doing a git flow feature - publish, the name should be optional. + publish, the name should be optional. When a name isn't given, the current branch, if it's a feature branch, will be published. -* Add option to select configuration file usage +* Add option to select configuration file usage As with the regular git config, git flow init now has the option --file, --global, --system and --local. --local is default. -* Add a new command. - New command git flow config is added. +* Add a new command. + New command git flow config is added. With this command you can see your current git flow configuration and you can also set the options. -* Environment settings for git-flow only. +* Environment settings for git-flow only. With git you can set environment variables to change behavior, like - GIT_MERGE_AUTOEDIT for example. + GIT_MERGE_AUTOEDIT for example. You can add these exports to the file ~/.gitflow_export if you only want - to set the environment variable for git-flow. -* Bugfix: Missing command hotfix track. + to set the environment variable for git-flow. +* Bugfix: Missing command hotfix track. The command git flow hotfix track is not implemented. #### 1.2.1 @@ -366,12 +371,12 @@ If the config `gitflow.allowdirty` is set to `true`, allow starting from a dirty * Improve the help output of the commands. * Fix problem with init function on BSD systems. * Add initialize function to git flow version. -* Add parameter --showcommands to all commands. +* Add parameter --showcommands to all commands. This will show the git commands performed while executing the command. Thanks to [Jerome Baum][jeromebaum] for the original implementation. [Daniel Dehennin][baby-gnu] -* Display where user is on finish. +* Display where user is on finish. Some commands did not display the branch you are on after the command finished. * When finishing a hotfix/release and it's to be tagged, the tag must not exist. @@ -380,16 +385,16 @@ If the config `gitflow.allowdirty` is set to `true`, allow starting from a dirty [Peter van der Does][petervanderdoes] * Bugfix: feature finish does double merge when using squash option. -* Add the ability to keep/delete local/remote branches on finish. +* Add the ability to keep/delete local/remote branches on finish. When finishing a release/hotfix/feature you now can keep/delete the local/remote release/hotfix/feature branch. -* New command: git flow release branch +* New command: git flow release branch With this command you can directly release a given branch. There is no need to start a new release and finish it. You can not use this command on the git-flow branches feature/hotfix/release/support. -* Do not display object fetch summary if flag was not set. +* Do not display object fetch summary if flag was not set. Thanks to [Daniel Dehennin][baby-gnu]. * Bugfix: Checking if branch exists will fail for remote branches. @@ -398,28 +403,28 @@ If the config `gitflow.allowdirty` is set to `true`, allow starting from a dirty * Bugfix: When running git flow init an error message pops up. -* Show correct help for subactions. +* Show correct help for subactions. When requesting help with -h for the subactions, the help would show the incorrect command line. -* Support reading the tag message from a file in release/hotfix finish. +* Support reading the tag message from a file in release/hotfix finish. Add the option -f,--messagefile to release and hotfix finish. Thanks to [Steve Streeting][sinbad] for the original coding. -* Bugfix: git_current_branch fails for git prior 1.7.10. +* Bugfix: git_current_branch fails for git prior 1.7.10. git symbolic-ref does not have the --short option prior to version 1.7.10. Bug found by [Daniel Dehennin][baby-gnu]. -* Clean up code. - Remove all porcelain commands. +* Clean up code. + Remove all porcelain commands. Refactor code. -* Improve the back-merge functionality. +* Improve the back-merge functionality. Adds an command line option (-b), which the user can utilize if the user doesn't want to back-merge but rather merge the release branch into develop. -* Add the sub-action delete to sub-commands feature, release and hotfix. +* Add the sub-action delete to sub-commands feature, release and hotfix. The sub-commands feature, release and hotfix now have a new sub-action, delete. With that action you can delete the branches, locally and remote. The action has two options, -f and -r. With -f you can force the deletion, @@ -427,21 +432,21 @@ If the config `gitflow.allowdirty` is set to `true`, allow starting from a dirty branch will also be deleted. [Daniel Dehennin][baby-gnu] -* Bugfix: release/feature/hotfix start -F fails. +* Bugfix: release/feature/hotfix start -F fails. Usage of positional parameters requires to eval ${FLAGS_ARGV}. The "eval set" in function call does not propagate to the caller. -* Accept tags as base for hotfix/release/support start. +* Accept tags as base for hotfix/release/support start. Commit pointed by tags are reachable with ^0\[1\]. * Check for parameter existence for branch and tag existence helpers. -* Do not finish hotfixes if they have no commits. +* Do not finish hotfixes if they have no commits. A hotfix branch must have some commits and be ahead of master. * Bugfix: When running git flow version an error message pops up. -* Reorder fetch and sanity checks. +* Reorder fetch and sanity checks. When a user requests a fetch for git flow {feature|hotfix|support} start, do this before some sanity checks to avoid any conflict in branch names and/or version. @@ -449,16 +454,16 @@ If the config `gitflow.allowdirty` is set to `true`, allow starting from a dirty * Fix flag test in cmd_delete(). [Myke Hines][mykehsd] -* Feature and Release squashing options. +* Feature and Release squashing options. This allows a -S option to both feature and releasing finishing actions so that developers can squash commits into one large one. [Peter Ragone][pcragone] -* Add init to git-flow-{feature,release,hotfix,support}. +* Add init to git-flow-{feature,release,hotfix,support}. Fixes the relatively minor issue where 'git flow subcommand help' gives "Not a gitflow-enabled repo yet". -* Special thanks to the following individual: +* Special thanks to the following individual: [Gert Van Gool][gvangool] #### 1.0-avh @@ -466,13 +471,13 @@ If the config `gitflow.allowdirty` is set to `true`, allow starting from a dirty * Remove trailing whitespace. -* Updated from latest develop branch from nvie. +* Updated from latest develop branch from nvie. Some features were still missing. -* Remove the submodule shFlags. +* Remove the submodule shFlags. Instead of the submodule we'll just use the file. -* When finishing a release or hotfix, use tag for back-merging if available. +* When finishing a release or hotfix, use tag for back-merging if available. When a release or hotfix branch is tagged, the tag is never merged into the develop branch, it is preferable to have the tag in the develop branch as well, for use with git describe for example. @@ -481,15 +486,15 @@ If the config `gitflow.allowdirty` is set to `true`, allow starting from a dirty * Bugfix: Typo when pulling existing feature from remote.Thanks to [John Harrison][bloomonkey], [Miltos][mallamanis], [Kostas][kperi] and [memleak][memleak]. -* Wrong variable names in the bare-bones. +* Wrong variable names in the bare-bones. The wrong variable name is set, this can lead to confusing on what's passed to the script, [Steve Streeting][sinbad] -* Fixes the suggested name for the integration branch. +* Fixes the suggested name for the integration branch. When git init -d is executed on a repo with multiple branches, the suggested name for the integration branch could possibly be the same name - that was already selected for the production release branch. + that was already selected for the production release branch. If no suggested name is determined the suggested name remains empty which leads to all sorts of other problems. diff --git a/git-flow-version b/git-flow-version index f25da3b5..07c05fcf 100644 --- a/git-flow-version +++ b/git-flow-version @@ -38,7 +38,7 @@ # -GITFLOW_VERSION=1.12.5-dev.11 +GITFLOW_VERSION=1.12.5 initialize() { # A function can not be empty. Comments count as empty.