refactor: try to fetch header

archguard · Dec 8, 2023 · 0cca6a4 · 0cca6a4
1 parent 230372b
commit 0cca6a4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/pipeline/checkout/src/main/kotlin/org/archguard/action/checkout/GitCommandManager.kt b/pipeline/checkout/src/main/kotlin/org/archguard/action/checkout/GitCommandManager.kt
@@ -146,14 +146,14 @@ class GitCommandManager(var workingDirectory: String = ".", private var lfs: Boo
 
  if (output != null) {
  // Satisfy compiler, will always be set
- return parseDefaultBranch(output!!.stdout)
+ return parseDefaultBranch(output!!.stdout) ?: throw Error("Unexpected output when retrieving default branch")
  }
 
  throw Error("Unexpected output when retrieving default branch")
  }
 
  @TestOnly
- fun parseDefaultBranch(lines: String): String {
+ fun parseDefaultBranch(lines: String): String? {
  for (splitLine in lines.trim().split("\n")) {
  val line = splitLine.trim()
  if (line.startsWith("ref:") && line.endsWith("HEAD")) {
@@ -163,7 +163,9 @@ class GitCommandManager(var workingDirectory: String = ".", private var lfs: Boo
  }
  }
 
- throw Error("Unexpected output when retrieving default branch")
+ logger.error("Output: $lines")
+ logger.error("Unexpected output when retrieving default branch")
+ return null
  }
 
  fun submoduleForeach(command: String, recursive: Boolean): GitOutput {

diff --git a/pipeline/checkout/src/main/kotlin/org/archguard/action/checkout/GitSourceSettings.kt b/pipeline/checkout/src/main/kotlin/org/archguard/action/checkout/GitSourceSettings.kt
@@ -13,7 +13,7 @@ class GitSourceSettings(
  val serverSide: Boolean = false,
  val submodule: Boolean = false,
  var fetchDepth: Int = 0,
- val workdir: String = "",
+ var workdir: String = "",
 ) : CommandSetting {
  val gitServerUrl: String = "https://github.com"
  val nestedSubmodules: Boolean = false
@@ -35,7 +35,7 @@ class GitSourceSettings(
  sshKey = argsMap["--ssh-key"] ?: "",
  serverSide = argsMap["--server-side"]?.toBoolean() ?: false,
  submodule = argsMap["--submodule"]?.toBoolean() ?: false,
- workdir = argsMap["--workdir"] ?: "",
+ workdir = argsMap["--workdir"] ?: ".",
  )
  }
  }

diff --git a/pipeline/checkout/src/test/kotlin/org/archguard/action/checkout/GitSourceSettingsTest.kt b/pipeline/checkout/src/test/kotlin/org/archguard/action/checkout/GitSourceSettingsTest.kt
@@ -10,10 +10,7 @@ class GitSourceSettingsTest {
  val branch = "master"
 
  val settings = GitSourceSettings.fromArgs(arrayOf("--repository", repository, "--branch", branch))
- settings.repositoryPath = ".tmp/codedb"
-
-// settings.repository shouldBe repository
-// settings.branch shouldBe branch
+ settings.workdir = ".tmp"
 
  val commandManager = GitCommandManager(settings.repositoryPath)
  doCheckout(commandManager, settings)