Fetch remote release branch on hotfix-finish goal - closes #318

aleksandr-m · Jun 14, 2022 · ea7841d · ea7841d
1 parent ae3e628
commit ea7841d
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowHotfixFinishMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowHotfixFinishMojo.java
@@ -194,6 +194,19 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                         gitFetchRemoteAndCompareCreate(gitFlowConfig.getDevelopmentBranch());
                     }
                     gitFetchRemoteAndCompareCreate(gitFlowConfig.getProductionBranch());
+
+                    // release branch
+                    String remoteReleases = gitFetchAndFindRemoteBranches(gitFlowConfig.getReleaseBranchPrefix(), false);
+                    if (StringUtils.isNotBlank(remoteReleases)) {
+                        // remove remote name with slash from branch name
+                        String remoteRelease = remoteReleases.substring(gitFlowConfig.getOrigin().length() + 1);
+
+                        if (StringUtils.countMatches(remoteRelease, gitFlowConfig.getReleaseBranchPrefix()) > 1) {
+                            throw new MojoFailureException("More than one remote release branch exists. Cannot finish hotfix.");
+                        }
+
+                        gitCreateBranch(remoteRelease, remoteReleases);
+                    }
                 }
             }