From 42ec5a7cb82d0e8bae1062c9885967189a38c970 Mon Sep 17 00:00:00 2001 From: Chris Stone Date: Thu, 6 Jul 2023 02:22:00 -0600 Subject: [PATCH] Release/2.2.0 (#75) * docs(changelog): add release notes * feat(git-flow): add support for busybox(#12) * feat(init): add support for environment credentials (#19) Allows git flow to fall back to the same environment variables git uses for setting the author and committer details if they are not present in the users .gitconfig * feat(init): add option to sign initial commit (#59) When running git flow init the following option is now available when creating a git repository using git flow.. 1) -g, --[no]sign Sign initial commit when creating a repository When setting up git flow in a freshly created git repository with no prior commits or when using git flow to create a git repository in an existing folder the sign flag will create a signed empty commit with the message initial commit. * feat(feature): add feature release command (#64) Added git flow feature release to provide a quick way to create a release branch from a existing feature branch. * fix(hotfix): git flow hotfix track fails due to branch name check (#68) * feat(hotfix): add cherrypick option to hotfix finish (#73) * feat(hotfix): add backmerge option to release branch (#71) * fix(hotfix): git flow hotfix finish -b back-merges to develop (#66) When runing hotfix finish the following options have been the following options have been added: 1) -r, --releaseBackmerge Back-merge to release branch if exists 2) -c, --cherrypick Cherry Pick to develop instead of merge 3) -b, --[no]nobackmerge Don't merge master, or tag onto develop NOTE: One one of the above three options can be used at any given time since it doesn't make sence to combine them. * fix(log): fix git flow log help message (#15) git flow log help no longer implies it can only be used with feature branches * chore(release): release version 2.2.0 --- CHANGELOG.md | 20 ++++++++++---------- git-flow-hotfix | 6 +++++- git-flow-init | 4 ++-- git-flow-version | 2 +- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 171b2300..8822ddce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,15 @@ # Changelog -#### 2.2.0-SNAPSHOT -* feat: add option to hotfix finish to allow for backmerge to release branch. Thank You [Bankers88](https://github.com/Bankers88) -* fix: Prevent hotfixes being merged to develop with nobackmerge flag. Thank You [adamrodger](https://github.com/adamrodger) -* feat(feature): add release sub command. Thank You [codesurf42](https://github.com/codesurf42) for the initial pr -* feat(init): add sign flag to create initial signed commit -* feat(init): add support for "Support Git Environment Credentials" pull request #19 from filipekiss/feature/environment_credentials -* docs: update repository url in source files -* docs: update copyright information in source files -* fix: wording for help text in git flow log pull request #15 from Shea690901/hotfix/git-flow-log_help-message -* refactor(git-flow): add support for busybox-readlink request #12 from KAction/readlink-busybox +#### 2.2.0 +* feat(init): add option to sign initial commit (#59) +* feat(git-flow): add support for environment credentials (#19) +* feat(git-flow): add support for busybox(#12) +* feat(feature): add feature release command (#64) +* feat(hotfix): add cherrypick option to hotfix finish (#73) +* feat(hotfix): add backmerge option to release branch (#71) +* fix(hotfix): git flow hotfix finish -b still back-merges to develop (#66) +* fix(hotfix): git flow hotfix track fails due to branch name check (#68) +* fix: git flow log help message (#15) #### 2.1.0 * feat: add create command to release allowing for a single step release prodution diff --git a/git-flow-hotfix b/git-flow-hotfix index 17c88cf1..f1e98533 100644 --- a/git-flow-hotfix +++ b/git-flow-hotfix @@ -366,7 +366,7 @@ showcommands! Show git commands while executing them cmd_finish() { OPTIONS_SPEC="\ -git flow hotfix finish [-h] [-F] [-s] [-u] [-m | -f ] [-p] [-k] [-n] [-b | -c] [-S] +git flow hotfix finish [-h] [-F] [-s] [-u] [-m | -f ] [-p] [-k] [-n] [-b | -c | -r] [-S] Finish hotfix branch -- @@ -465,6 +465,10 @@ c,cherrypick Cherry Pick to $DEVELOP_BRANCH instead of merge die "You can't use 'cherrypick' and 'releasebackmerge' together." fi + if flag nobackmerge && flag releasebackmerge; then + die "You can't use 'nobackmerge' && 'releasebackmerge' together." + fi + # Sanity checks require_branch "$BRANCH" require_clean_working_tree diff --git a/git-flow-init b/git-flow-init index b150c754..0ab7b190 100644 --- a/git-flow-init +++ b/git-flow-init @@ -59,7 +59,7 @@ parse_args() { # Default entry when no SUBACTION is given cmd_default() { OPTIONS_SPEC="\ -git flow init [-h] [-d] [-f] +git flow init [-h] [-d] [-f] [-g] Setup a git repository for git flow usage. Can also be used to start a git repository. -- @@ -396,7 +396,7 @@ file= use given config file [ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion} git_do config $gitflow_config_option gitflow.prefix.support "$prefix" fi - + # Version tag prefix if ! git config --get gitflow.prefix.versiontag >/dev/null 2>&1 || flag force; then if [ "$FLAGS_tag" != "" ]; then diff --git a/git-flow-version b/git-flow-version index af8c6f99..64a480fd 100644 --- a/git-flow-version +++ b/git-flow-version @@ -39,7 +39,7 @@ # -GITFLOW_VERSION=2.2.0-SNAPSHOT-2 +GITFLOW_VERSION=2.2.0 initialize() { # A function can not be empty. Comments count as empty.