From 63fa34a1c2713a7ba0a85e852766cb0aa49fcc86 Mon Sep 17 00:00:00 2001
From: 1024x2
Date: Sat, 9 Mar 2024 08:06:17 +0000
Subject: Tweak toolbox icon, make Updater not show local changes as updates

---
 0004-Updater-don-t-prompt-for-updates-when-on-a-local-bra.patch | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to '0004-Updater-don-t-prompt-for-updates-when-on-a-local-bra.patch')

diff --git a/0004-Updater-don-t-prompt-for-updates-when-on-a-local-bra.patch b/0004-Updater-don-t-prompt-for-updates-when-on-a-local-bra.patch
index 0910bec..aa35d25 100644
--- a/0004-Updater-don-t-prompt-for-updates-when-on-a-local-bra.patch
+++ b/0004-Updater-don-t-prompt-for-updates-when-on-a-local-bra.patch
@@ -1,6 +1,6 @@
-From 00aba2082b64d8f01ea796f1118030bd944ebcc6 Mon Sep 17 00:00:00 2001
+From ef30d1ed8a99d97556a31b5bb2e9d0f6019bb49a Mon Sep 17 00:00:00 2001
 From: 1024x2 <2pow11@gmail.com>
-Date: Wed, 11 Oct 2023 15:55:03 +0100
+Date: Sat, 9 Mar 2024 08:00:55 +0000
 Subject: [PATCH 4/5] Updater: don't prompt for updates when on a local branch
 
 ---
@@ -8,7 +8,7 @@ Subject: [PATCH 4/5] Updater: don't prompt for updates when on a local branch
  1 file changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/src/main/updater/git.ts b/src/main/updater/git.ts
-index 20a5d70..21f33d1 100644
+index 20a5d70..c530e67 100644
 --- a/src/main/updater/git.ts
 +++ b/src/main/updater/git.ts
 @@ -49,12 +49,7 @@ async function getRepo() {
@@ -21,7 +21,7 @@ index 20a5d70..21f33d1 100644
 -    if (!existsOnOrigin) return [];
 -
 -    const res = await git("log", `HEAD...origin/${branch}`, "--pretty=format:%an/%h/%s");
-+    const res = await git("log", "HEAD...@{u}", "--pretty=format:%an/%h/%s");
++    const res = await git("log", "HEAD..@{u}", "--pretty=format:%an/%h/%s");
  
      const commits = res.stdout.trim();
      return commits ? commits.split("\n").map(line => {
-- 
cgit v1.2.3