Fix remote branch fetching and comparing

aleksandr-m · Jun 2, 2022 · 64aa964 · 64aa964
1 parent 4b40a6c
commit 64aa964
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java
@@ -990,9 +990,9 @@ protected void gitBranchDeleteForce(final String branchName)
      *             If command line execution fails.
      */
     protected void gitFetchRemoteAndCompareCreate(final String branchName) throws MojoFailureException, CommandLineException {
-        final boolean fetchOk = gitFetchRemote();
+        final boolean remoteBranchExists = StringUtils.isNotBlank(gitFetchAndFindRemoteBranches(branchName, true));
         if (gitCheckBranchExists(branchName)) {
-            if (fetchOk) {
+            if (remoteBranchExists) {
                 getLog().info(
                         "Comparing local branch '" + branchName + "' with remote '" + gitFlowConfig.getOrigin() + "/" + branchName + "'.");
                 String revlistout = executeGitCommandReturn("rev-list", "--left-right", "--count",