Get branchname from repo instance instead of location url (#2242)

2020-09-02 15:30:35 +02:00
parent 8e9326cd53
commit 07c9a9474a
1 changed files with 3 additions and 2 deletions
@@ -79,9 +79,10 @@ export const checkoutGitRepository = async (

  if (fs.existsSync(repositoryTmpPath)) {
    const repository = await Repository.open(repositoryTmpPath);
+    const currentBranchName = (await repository.getCurrentBranch()).shorthand();
    await repository.mergeBranches(
-      parsedGitLocation.ref,
-      `origin/${parsedGitLocation.ref}`,
+      currentBranchName,
+      `origin/${currentBranchName}`,
    );
    return repositoryTmpPath;
  }