improve finding of hotfix support branches in hotfix-finish - closes #68

aleksandr-m · Nov 15, 2017 · 3f310af · 3f310af
1 parent c428b5b
commit 3f310af
Showing 1 changed file with 8 additions and 4 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
@@ -278,11 +278,15 @@ && notSameProdDevName()) {
         }
     }
 
-    private String promptBranchName()
-            throws MojoFailureException, CommandLineException {
+    private String promptBranchName() throws MojoFailureException, CommandLineException {
         // git for-each-ref --format='%(refname:short)' refs/heads/hotfix/*
-        final String hotfixBranches = gitFindBranches(
-                gitFlowConfig.getHotfixBranchPrefix(), false);
+        String hotfixBranches = gitFindBranches(gitFlowConfig.getHotfixBranchPrefix(), false);
+
+        // find hotfix support branches
+        if (!gitFlowConfig.getHotfixBranchPrefix().endsWith("/")) {
+            String supportHotfixBranches = gitFindBranches(gitFlowConfig.getHotfixBranchPrefix() + "*/*", false);
+            hotfixBranches = hotfixBranches + supportHotfixBranches;
+        }
 
         if (StringUtils.isBlank(hotfixBranches)) {
             throw new MojoFailureException("There are no hotfix branches.");