Merge pull request #32 from Praqma/ready/fix-for-29

Fix for #29

Author: MadsNielsen

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

@@ -153,14 +153,15 @@ public void integrate(AbstractBuild<?, ?> build, Launcher launcher, BuildListene
             logMessage = String.format(PretestedIntegrationBuildWrapper.LOG_PREFIX + "Commit of accumulated merge done");
             LOGGER.info(logMessage);
             listener.getLogger().println(logMessage);
-        }  catch (IOException | GitException | InterruptedException ex) {
-            // If ".git/MERGE_MSG" wasn't found the most likely culrprit is that the merge was an empty
-            // one (No changes) for some reason the merge() command does not complain or throw exception when that happens
-            if(ex.getMessage().contains("Cannot commit") || ex.getMessage().contains("MERGE_MSG (No such file or directory)")) {
-                logMessage = String.format("%sUnable to commit changes. Most likely you are trying to integrate a change that was already integrated. Message was:%n%s", PretestedIntegrationBuildWrapper.LOG_PREFIX, ex.getMessage());
-            } else {
-                logMessage = String.format(PretestedIntegrationBuildWrapper.LOG_PREFIX + "Exception while committing. Logging exception msg: %s", ex.getMessage());
-            }
+        }  catch (FileNotFoundException | GitException ex) {
+            //See Github issue #29 (https://github.com/Praqma/pretested-integration-plugin/issues/29)
+            logMessage = String.format("%sUnable to commit changes. Most likely you are trying to integrate a change that was already integrated. Message was:%n%s", PretestedIntegrationBuildWrapper.LOG_PREFIX, ex.getMessage());
+            LOGGER.log(Level.SEVERE, logMessage, ex);
+            listener.getLogger().println(logMessage);
+            ex.printStackTrace(listener.getLogger());
+            throw new IntegrationFailedException(ex);
+        }  catch ( IOException | InterruptedException ex) {
+            logMessage = String.format(PretestedIntegrationBuildWrapper.LOG_PREFIX + "Exception while committing. Logging exception msg: %s", ex.getMessage());
             LOGGER.log(Level.SEVERE, logMessage, ex);
             listener.getLogger().println(logMessage);
             ex.printStackTrace(listener.getLogger());

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

@@ -93,7 +93,7 @@ public void integrate(AbstractBuild<?, ?> build, Launcher launcher, BuildListene
             LOGGER.log(Level.INFO, logMessage);
             listener.getLogger().println(logMessage);
             commitAuthor = client.withRepository(new FindCommitAuthorCallback(listener, builtBranch.getSHA1()));
-            logMessage = String.format(PretestedIntegrationBuildWrapper.LOG_PREFIX + "Done colecting last commit author: %s", commitAuthor);
+            logMessage = String.format(PretestedIntegrationBuildWrapper.LOG_PREFIX + "Done collecting last commit author: %s", commitAuthor);
             LOGGER.log(Level.INFO, logMessage);
             listener.getLogger().println(logMessage);
 
@@ -127,14 +127,14 @@ public void integrate(AbstractBuild<?, ?> build, Launcher launcher, BuildListene
             logMessage = String.format(PretestedIntegrationBuildWrapper.LOG_PREFIX + "Commit of squashed merge done");
             LOGGER.info(logMessage);
             listener.getLogger().println(logMessage);
-        } catch (IOException | GitException | InterruptedException ex) {
-            // If ".git/MERGE_MSG" wasn't found the most likely culrprit is that the merge was an empty
-            // one (No changes) for some reason the merge() command does not complain or throw exception when that happens
-            if(ex.getMessage().contains("Cannot commit") || ex.getMessage().contains("MERGE_MSG (No such file or directory)")) {
-                logMessage = String.format("%sUnable to commit changes. Most likely you are trying to integrate a change that was already integrated. Message was:%n%s", PretestedIntegrationBuildWrapper.LOG_PREFIX, ex.getMessage());
-            } else {
-                logMessage = String.format(PretestedIntegrationBuildWrapper.LOG_PREFIX + "Exception while committing. Logging exception msg: %s", ex.getMessage());
-            }
+        } catch (FileNotFoundException | GitException ex) {
+            //See Github issue #29 (https://github.com/Praqma/pretested-integration-plugin/issues/29)
+            logMessage = String.format("%sUnable to commit changes. Most likely you are trying to integrate a change that was already integrated. Message was:%n%s", PretestedIntegrationBuildWrapper.LOG_PREFIX, ex.getMessage());
+            LOGGER.log(Level.SEVERE, logMessage, ex);
+            listener.getLogger().println(logMessage);
+            throw new IntegrationFailedException(ex);
+        } catch (IOException | InterruptedException ex) {
+            logMessage = String.format(PretestedIntegrationBuildWrapper.LOG_PREFIX + "Exception while committing. Logging exception msg: %s", ex.getMessage());
             LOGGER.log(Level.SEVERE, logMessage, ex);
             listener.getLogger().println(logMessage);
             throw new IntegrationFailedException(ex);