Status.UP_TO_DATE is successful

apache · Apr 8, 2024 · dca79a8 · dca79a8
1 parent 2f6591c
commit dca79a8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/...main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java b/...main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java
@@ -53,6 +53,22 @@ protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository reposi
         }
     }
 
+    @Test
+    public void testUpToDatePush() throws Exception {
+        File checkedOutRepo = getWorkingCopy();
+
+        ScmRepository scmRepository = getScmManager().makeScmRepository(getScmUrl());
+        checkoutRepoInto(checkedOutRepo, scmRepository);
+
+        // Add a default user to the config
+        GitScmTestUtils.setDefaulGitConfig(checkedOutRepo);
+
+        CheckInScmResult result =
+                getScmManager().checkIn(scmRepository, new ScmFileSet(checkedOutRepo), "No change commit message");
+
+        assertResultIsSuccess(result);
+    }
+
     @Test
     public void testRejectedNonFastForwardPush() throws Exception {
         File blockingRepo = PlexusJUnit4TestSupport.getTestFile("target/scm-test/blocking-repo");

diff --git a/.../main/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommand.java b/.../main/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommand.java
@@ -145,7 +145,7 @@ protected CheckInScmResult executeCheckInCommand(
 
                 for (PushResult pushResult : pushResultList) {
                     for (RemoteRefUpdate remoteRefUpdate : pushResult.getRemoteUpdates()) {
-                        if (remoteRefUpdate.getStatus() != RemoteRefUpdate.Status.OK) {
+                        if (!isSuccessStatus(remoteRefUpdate.getStatus())) {
                             return new CheckInScmResult(
                                     "JGit checkin",
                                     "The git-push command failed, with status: " + remoteRefUpdate.getStatus(),
@@ -164,7 +164,13 @@ protected CheckInScmResult executeCheckInCommand(
         }
     }
 
+    private boolean isSuccessStatus(RemoteRefUpdate.Status remoteRefUpdateStatus) {
+        return remoteRefUpdateStatus == RemoteRefUpdate.Status.OK
+                || remoteRefUpdateStatus == RemoteRefUpdate.Status.UP_TO_DATE;
+    }
+
     private static final class UserInfo {
+
         final String name;
 
         final String email;