add 'skipMergeProdBranch' option to hotfix:finish (similar to skipMergeDevBranch) #164
Conversation
src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowHotfixFinishMojo.java
Outdated
Show resolved
Hide resolved
| @@ -220,6 +219,20 @@ public void execute() throws MojoExecutionException, MojoFailureException { | |||
| commitMessages.getTagHotfixMessage(), gpgSignTag, properties); | |||
| } | |||
|
|
|||
| if (supportBranchName != null) { | |||
There was a problem hiding this comment.
Why did you move merging after tagging? It will probably create tag on the wrong commit.
There was a problem hiding this comment.
I want to tag the hotfix branch, and not the production branch which never gets the changes merged in our use case. Moving the merge to after tagging does that, and in the "normal' use of merging to production the tag is still created. From my testing the change results in the tag being associated with the last commit of the branch instead of with the merge commit.
Another approach would be to revert to merging before tagging, but not checking out production when 'skipMergeProdBranch' is specified. Tagging would then occur as normal.
Then immediately after the tagging check for the 'skipMergeProdBranch' (and supportBranchName is null) to ensure the expected branch is active for subsequent processing:
| if (supportBranchName != null) { | |
| if (skipMergeProdBranch && (supportBranchName == null)) { | |
| // git checkout master | |
| gitCheckout(gitFlowConfig.getProductionBranch()); | |
| } |
Appreciate your insight
There was a problem hiding this comment.
Do you need to checkout production branch at all if skipMergeProdBranch is enabled?
There was a problem hiding this comment.
We need to switch off the hotfix branch so it can be deleted. I think switching to production is safest as it aligns with the existing logic
There was a problem hiding this comment.
Yeah, it is seems that if (skipMergeProdBranch && (supportBranchName == null)) is better than other alternatives where it is also needed to adjust currentVersion.
Go ahead!
There was a problem hiding this comment.
Can you also squash all the commits, after resolving this.
There was a problem hiding this comment.
Just pushed the latest. Let me know if anything needs adjustment
|
Hi @aleksandr-m , I asked @chulan to make this change, so I will explain if you don't mind :) The history here is that we were using the jgitflow plugin which, as you probably know, has been abandoned so I'm looking to switch to your plugin. jgitflow did have switches to avoid merging, and I'm looking to keep that workflow. We do use support branches as well, but in our workflow they are the exception; hotfix branches are tagged and left behind (the branch is deleted, the tag remains) as software is quickly moved to newer versions of dependencies. Thanks! :) |
chulan
changed the title
…x-branch to production-branch
aleksandr-m
requested review from
aleksandr-m
and removed request for
aleksandr-m
|
@chulan Good work. Thank you. |
|
@chulan @glianeric 1.12.0 is out. |
|
Excellent, thank you! :) |
|
Great, thanks! |
when creating hotfixes, especially to older versions, merging the change into master is not necessary.