From 660cc9b49bb3d9f764d326bfe4f6eebccecd0f2c Mon Sep 17 00:00:00 2001
From: Taliesin Sisson <taliesins@yahoo.com>
Date: Tue, 4 Apr 2023 20:00:00 +0100
Subject: [PATCH] fix: pull changes from working branch

The temporary branch is created from the working base branch. So the differences between the two branches will always be none. What we want is all the differences from temporary branch to the base branch.
---
 src/create-or-update-branch.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/create-or-update-branch.ts b/src/create-or-update-branch.ts
index ebdef12..92745eb 100644
--- a/src/create-or-update-branch.ts
+++ b/src/create-or-update-branch.ts
@@ -195,7 +195,7 @@ export async function createOrUpdateBranch(
     await git.checkout(base)
     // Cherrypick commits from the temporary branch starting from the working base
     const commits = await git.revList(
-      [`${workingBase}..${tempBranch}`, '.'],
+      [`${base}..${tempBranch}`, '.'],
       ['--reverse']
     )
     for (const commit of splitLines(commits)) {