Fix UpdateChecker error when diverged from branch

jpenilla · Oct 17, 2024 · 05d5ef6 · 05d5ef6
1 parent 9d44f94
commit 05d5ef6
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/common/src/main/java/xyz/jpenilla/squaremap/common/util/UpdateChecker.java b/common/src/main/java/xyz/jpenilla/squaremap/common/util/UpdateChecker.java
@@ -60,6 +60,7 @@ private void checkSnapshot(final Manifest manifest) {
             }
             case Distance.Failure failure -> this.logger.warn("Error obtaining version information", failure.reason());
             case Distance.Ahead $ -> this.logger.info("Commit '{}' is ahead of branch '{}', local build?", gitHash, branch);
+            case Distance.Diverged $ -> this.logger.info("Commit '{}' is diverged from branch '{}', local build?", gitHash, branch);
             case Distance.UnknownCommit $ -> this.logger.info(Messages.UPDATE_CHECKER_UNKNOWN_COMMIT.replace("<commit>", gitHash));
         }
     }
@@ -117,6 +118,7 @@ private Distance fetchDistance(final String branch, final String hash) {
                     case "identical" -> new Distance.UpToDate();
                     case "behind" -> new Distance.Behind(response.get("behind_by").getAsInt());
                     case "ahead" -> new Distance.Ahead();
+                    case "diverged" -> new Distance.Diverged();
                     default -> new Distance.Failure(new IllegalArgumentException("Unknown status: '" + status + "'"));
                 };
             }
@@ -140,6 +142,9 @@ final class UpToDate implements Distance {
 
         final class Ahead implements Distance {
         }
+
+        final class Diverged implements Distance {
+        }
     }
 
     private record Releases(List<String> releaseList, Map<String, String> releaseUrls) {