fix: create branch from upstream default branch (#107)

russellbanks · Feb 20, 2023 · 84dc9fd · 84dc9fd
1 parent 8eae66e
commit 84dc9fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/main/kotlin/commands/RemoveVersion.kt b/src/main/kotlin/commands/RemoveVersion.kt
@@ -59,7 +59,7 @@ class RemoveVersion : CliktCommand(name = "remove"), KoinComponent {
  if (!shouldRemoveManifest) return@runBlocking
  echo()
  val forkRepository = githubImpl.getWingetPkgsFork(this) ?: return@runBlocking
- val ref = githubImpl.createBranchFromDefaultBranch(forkRepository, this) ?: return@runBlocking
+ val ref = githubImpl.createBranchFromUpstreamDefaultBranch(forkRepository, this) ?: return@runBlocking
  val directoryContent: MutableList<GHContent> =
  forkRepository.getDirectoryContent(githubImpl.baseGitHubPath, ref.ref)
  val progress = progressAnimation {

diff --git a/src/main/kotlin/data/GitHubImpl.kt b/src/main/kotlin/data/GitHubImpl.kt
@@ -121,12 +121,14 @@ class GitHubImpl : KoinComponent {
  }
  }
 
- fun createBranchFromDefaultBranch(repository: GHRepository, terminal: Terminal): GHRef? {
+ suspend fun createBranchFromUpstreamDefaultBranch(repository: GHRepository, terminal: Terminal): GHRef? {
  return try {
- repository.createRef(
- /* name = */ "refs/heads/${getBranchName()}",
- /* sha = */ repository.getBranch(repository.defaultBranch).shA1
- ).also { pullRequestBranch = it }
+ getMicrosoftWinGetPkgs()?.let { upstreamRepository ->
+ repository.createRef(
+ /* name = */ "refs/heads/${getBranchName()}",
+ /* sha = */ upstreamRepository.getBranch(upstreamRepository.defaultBranch).shA1
+ ).also { pullRequestBranch = it }
+ }
  } catch (ioException: IOException) {
  terminal.danger(ioException.message ?: "Failed to create branch.")
  null
@@ -175,7 +177,7 @@ class GitHubImpl : KoinComponent {
 
  private suspend fun commitFiles(files: List<Pair<String, String?>>, terminal: Terminal) {
  val repository = getWingetPkgsFork(terminal) ?: return
- val branch = createBranchFromDefaultBranch(repository, terminal) ?: return
+ val branch = createBranchFromUpstreamDefaultBranch(repository, terminal) ?: return
  repository.createCommit()
  ?.message(getCommitTitle())
  ?.parent(branch.getObject()?.sha)