From a941a2a9245dea5657183b14808402b0be4d3e18 Mon Sep 17 00:00:00 2001 From: Peter van der Does Date: Thu, 23 May 2019 10:16:11 -0400 Subject: [PATCH 1/4] Preparation for next release --- CHANGELOG.md | 3 +++ git-flow-version | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fd5f02f..5fc35ad7 100644 --- a/CHANGELOG.md +++ b/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. diff --git a/git-flow-version b/git-flow-version index e5814e86..324984c5 100644 --- a/git-flow-version +++ b/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-dev0 initialize() { # A function can not be empty. Comments count as empty. From 16177915cf4c07ce839919eb74d75e66d59973ea Mon Sep 17 00:00:00 2001 From: Luis Fernando Gomes Date: Wed, 8 Nov 2017 15:54:06 -0200 Subject: [PATCH 2/4] Add --noedit flag that accept the auto-generated message on merging --- AUTHORS | 1 + git-flow-release | 23 +++++++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/AUTHORS b/AUTHORS index 8fcecea9..91115980 100644 --- a/AUTHORS +++ b/AUTHORS @@ -55,6 +55,7 @@ Justin Penney Konstantin Tjuterev Kridsada Thanabulpong Leonardo Giordani +Luis Fernando Gomes @luiscoms Mark Borcherding Mark Derricutt Mateusz Kaczmarek diff --git a/git-flow-release b/git-flow-release index 3c10f5a7..93c5c3bb 100644 --- a/git-flow-release +++ b/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 @@ -150,6 +153,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 +163,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 @@ -603,7 +608,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] +git flow release finish [-h] [-F] [-s] [-u] [-m | -f] [-p] [-k] [-n] [-b] [-S] [-e] Finish a release branch @@ -627,6 +632,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 +655,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 " From 40fc2df960d034cb57dd277af7501be6884f767e Mon Sep 17 00:00:00 2001 From: Luis Fernando Gomes Date: Thu, 21 Jun 2018 16:22:30 -0300 Subject: [PATCH 3/4] Fix anotated tag without message --- git-flow-release | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/git-flow-release b/git-flow-release index 93c5c3bb..88e84b78 100644 --- a/git-flow-release +++ b/git-flow-release @@ -134,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 @@ -330,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 From 9498e9b3642be76c70af378b1aca2c95a3d501bc Mon Sep 17 00:00:00 2001 From: Shea690901 Date: Thu, 16 Nov 2017 00:32:53 +0100 Subject: [PATCH 4/4] (installer): (installer): (gitflow-installer.sh) added missing file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gitflow-installer.sh didn´t installed >git-flow-log< Signed-off-by: Shea690901 --- contrib/gitflow-installer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/gitflow-installer.sh b/contrib/gitflow-installer.sh index 76a1f4fe..0ffb407d 100644 --- a/contrib/gitflow-installer.sh +++ b/contrib/gitflow-installer.sh @@ -37,7 +37,7 @@ DATAROOTDIR="$PREFIX/share" DOCDIR="$DATAROOTDIR/doc/gitflow" EXEC_FILES="git-flow" -SCRIPT_FILES="git-flow-init git-flow-feature git-flow-bugfix git-flow-hotfix git-flow-release git-flow-support git-flow-version gitflow-common gitflow-shFlags git-flow-config" +SCRIPT_FILES="git-flow-init git-flow-feature git-flow-bugfix git-flow-hotfix git-flow-release git-flow-support git-flow-version gitflow-common gitflow-shFlags git-flow-config git-flow-log" HOOK_FILES="$REPO_NAME/hooks/*"