From 5ccb126decfdebe16db32a2df22d9e75e4949654 Mon Sep 17 00:00:00 2001
From: 1024x2
Date: Fri, 16 Feb 2024 22:04:43 +0000
Subject: Initial commit

---
 ...-t-prompt-for-updates-when-on-a-local-bra.patch | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 0004-Updater-don-t-prompt-for-updates-when-on-a-local-bra.patch

(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
new file mode 100644
index 0000000..b90d0c7
--- /dev/null
+++ b/0004-Updater-don-t-prompt-for-updates-when-on-a-local-bra.patch
@@ -0,0 +1,27 @@
+From 917df10a7d166fdfb4479ee28c40cb884bfc37dc Mon Sep 17 00:00:00 2001
+From: 1024x2 <2pow11@gmail.com>
+Date: Wed, 11 Oct 2023 15:55:03 +0100
+Subject: [PATCH 4/5] Updater: don't prompt for updates when on a local branch
+
+---
+ src/main/updater/git.ts | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/main/updater/git.ts b/src/main/updater/git.ts
+index 2ff3ba5..21f33d1 100644
+--- a/src/main/updater/git.ts
++++ b/src/main/updater/git.ts
+@@ -49,9 +49,7 @@ async function getRepo() {
+ async function calculateGitChanges() {
+     await git("fetch");
+ 
+-    const branch = await git("branch", "--show-current");
+-
+-    const res = await git("log", `HEAD...origin/${branch.stdout.trim()}`, "--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 => {
+-- 
+2.43.1
+
-- 
cgit v1.2.3