Update to gh-133. Use regex to parse and look for predictable non-ff …

…commit error

src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/GitBridge.java

@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.regex.Pattern;
 
 /**
  * The Git SCM Bridge.
@@ -85,6 +86,19 @@ public static void pushToBranch(TaskListener listener, GitClient client, String
             LOGGER.log(Level.SEVERE, "Failed to push changes to: " + targetRemoteBranch + ".\nException:", ex);
             listener.getLogger().println(GitMessages.LOG_PREFIX+ String.format("Failed to push changes to: " + targetRemoteBranch + ".\nException: %s", ex));
             throw new PushFailedException(String.format("Failed to push changes to branch, message was:%n%s", ex));
+        } catch (GitException gex) {
+            final Pattern nonFastForward = Pattern.compile(".*[rejected].*\\(non-fast-forward\\).*", Pattern.DOTALL);
+            //Something is wrong on the remote and it's not a fast forward issue...try again
+            if(gex.getMessage() != null && !nonFastForward.matcher(gex.getMessage()).matches()) {
+                LOGGER.log(Level.WARNING, LOG_PREFIX + "Failed to push...retying in 5 seconds");
+                listener.getLogger().println(LOG_PREFIX + "Failed to push...retying in 5 seconds");
+                try {
+                    Thread.sleep(5000); //Wait 5 seconds
+                } catch (InterruptedException e) { /* NOOP */ }
+                GitBridge.pushToBranch(listener, client, sourceLocalBranch, targetRemoteBranch, expandedRepo);
+            } else {
+                throw gex;
+            }
         }
     }
 

src/main/java/org/jenkinsci/plugins/pretestedintegration/scm/git/PretestedIntegrationAsGitPluginExt.java

@@ -35,6 +35,8 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.regex.Pattern;
+
 import org.apache.commons.lang.StringUtils;
 
 import static org.eclipse.jgit.lib.Constants.HEAD;
@@ -138,17 +140,7 @@ public Revision decorateRevisionToBuild(
                 gitStrategy.integrateAsGitPluginExt(scm, run, git, listener, marked, triggeredBranch, gitBridge);
                 //For AccumulatedCommit and in pipeline, immediately push back the merge result
                 if(gitStrategy instanceof AccumulatedCommitStrategy && run instanceof WorkflowRun) {
-                    try {
-                        GitBridge.pushToBranch(listener, git, expandedIntegrationBranch, triggeredBranch.getName(), repoName);
-                    } catch (GitException fex) {
-                        if(fex.getMessage().contains("error: cannot lock ref")) {
-                            //Something is wrong on the remote...try again
-                            LOGGER.log(Level.WARNING, LOG_PREFIX + "Failed to push...retying in 5 seconds");
-                            listener.getLogger().println(LOG_PREFIX + "Failed to push...retying in 5 seconds");
-                            Thread.sleep(5000);
-                            GitBridge.pushToBranch(listener, git, expandedIntegrationBranch, triggeredBranch.getName(), repoName);
-                        }
-                    }
+                    GitBridge.pushToBranch(listener, git, expandedIntegrationBranch, triggeredBranch.getName(), repoName);
                 }
                 run.addAction(new PretestTriggerCommitAction(triggeredBranch, expandedIntegrationBranch, expandedRepo, ucCredentialsId));
             } else {