From d6170aafc339a4b089f2ee204a6cc0660b482dc3 Mon Sep 17 00:00:00 2001
From: SrGooglo <srgooglo@ragestudio.net>
Date: Sun, 4 Feb 2024 21:52:18 +0100
Subject: [PATCH] use pull rebase after reset

---
 src/main/pkg_mng/installs_steps_methods/git_pull.js  | 2 +-
 src/main/pkg_mng/installs_steps_methods/git_reset.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/pkg_mng/installs_steps_methods/git_pull.js b/src/main/pkg_mng/installs_steps_methods/git_pull.js
index 5064078..de5d2a5 100644
--- a/src/main/pkg_mng/installs_steps_methods/git_pull.js
+++ b/src/main/pkg_mng/installs_steps_methods/git_pull.js
@@ -19,7 +19,7 @@ export default async (manifest, step) => {
 
     fs.mkdirSync(_path, { recursive: true })
 
-    await execa(gitCMD, ["pull"], {
+    await execa(gitCMD, ["pull", "--rebase"], {
         cwd: _path,
         stdout: "inherit",
         stderr: "inherit",
diff --git a/src/main/pkg_mng/installs_steps_methods/git_reset.js b/src/main/pkg_mng/installs_steps_methods/git_reset.js
index 05af31c..12bfa1f 100644
--- a/src/main/pkg_mng/installs_steps_methods/git_reset.js
+++ b/src/main/pkg_mng/installs_steps_methods/git_reset.js
@@ -49,10 +49,7 @@ export default async (manifest, step) => {
         statusText: `Reset from ${from}`,
     })
 
-    // pull the latest
-    await git_pull(manifest, step)
-
-    console.log(`[${manifest.id}] steps.git_reset() | Reseting to ${from}`)
+    console.log(`[${manifest.id}] steps.git_reset() | Resetting to ${from}`)
 
     await execa(gitCMD, ["reset", "--hard", from], {
         cwd: _path,
@@ -60,6 +57,9 @@ export default async (manifest, step) => {
         stderr: "inherit",
     })
 
+    // pull the latest
+    await git_pull(manifest, step)
+
     sendToRender(`pkg:update:status`, {
         id: manifest.id,
         statusText: `Checkout to HEAD`,