Fix origin/ prefix being applied too many places (#122)

Author: joshfriend

core/src/main/kotlin/xyz/block/artifactswap/core/download/services/ArtifactSyncBomLoader.kt

@@ -42,9 +42,11 @@ class RealArtifactSyncBomLoader(
   }
 
   override suspend fun findBestBomVersion(checkRemote: Boolean): Result<String> = runCatching {
+    val bomBranch = config.bomSourceBranchName
+    val originRef = if (bomBranch.startsWith("origin/")) bomBranch else "origin/$bomBranch"
     val recentSharedCommits =
       squareGit.findRecentSharedCommits(
-        baseRef = config.bomSourceBranchName,
+        baseRef = originRef,
         count = COUNT_SHARED_COMMITS_TO_CHECK_FOR_BOM,
       )
 
@@ -54,7 +56,7 @@ class RealArtifactSyncBomLoader(
       }
         ?: throw IllegalStateException(
           "Traversed $COUNT_SHARED_COMMITS_TO_CHECK_FOR_BOM commits " +
-            "from ${config.bomSourceBranchName} and found no matching BOMs"
+            "from $originRef and found no matching BOMs"
         )
     matchingBom.name
   }

core/src/main/kotlin/xyz/block/artifactswap/core/shared_services/git/SquareGit.kt

@@ -71,11 +71,9 @@ class RealSquareGit(rootDir: Path, private val context: CoroutineContext) : Squa
   }
 
   override suspend fun findRecentSharedCommits(baseRef: String, count: Int): List<ObjectId> {
-    val originRef = if (baseRef.startsWith("origin/")) baseRef else "origin/$baseRef"
-    LOGGER.info("Finding merge base between $originRef and ${Constants.HEAD}")
+    LOGGER.info("Finding merge base between $baseRef and ${Constants.HEAD}")
     val baseCommit =
-      repository.resolve(originRef)
-        ?: throw IllegalStateException("$originRef could not be resolved")
+      repository.resolve(baseRef) ?: throw IllegalStateException("$baseRef could not be resolved")
     val headCommit =
       repository.resolve(Constants.HEAD)
         ?: throw IllegalStateException("${Constants.HEAD} could not be resolved")
@@ -90,7 +88,7 @@ class RealSquareGit(rootDir: Path, private val context: CoroutineContext) : Squa
         }
       }
     if (mergeBase == null) {
-      throw IllegalStateException("No merge base found between $originRef and ${Constants.HEAD}")
+      throw IllegalStateException("No merge base found between $baseRef and ${Constants.HEAD}")
     }
     val commits = git.log().add(mergeBase).call().take(count).map { it.id }
     return commits
@@ -107,7 +105,7 @@ class RealSquareGit(rootDir: Path, private val context: CoroutineContext) : Squa
   @OptIn(ExperimentalCoroutinesApi::class)
   override suspend fun findChangedFiles(baseRef: String): Result<Set<Path>> = runCatching {
     val baseCommit =
-      findRecentSharedCommits(baseRef)?.first()
+      findRecentSharedCommits(baseRef).firstOrNull()
         ?: throw IllegalStateException("No recent shared commits found")
     LOGGER.debug("Got comparison labels: {}", getComparisonLabels(baseCommit))