diff options
author | 1024x2 | 2024-03-09 07:17:39 +0000 |
---|---|---|
committer | 1024x2 | 2024-03-09 07:17:39 +0000 |
commit | 048e9e496a4622359d6f29df93b9ec8b62a6a0d4 (patch) | |
tree | 60a34a90556b062508416baf22eddea56f3be947 /0004-Updater-don-t-prompt-for-updates-when-on-a-local-bra.patch | |
parent | 5ccb126decfdebe16db32a2df22d9e75e4949654 (diff) |
Update patches
Diffstat (limited to '0004-Updater-don-t-prompt-for-updates-when-on-a-local-bra.patch')
-rw-r--r-- | 0004-Updater-don-t-prompt-for-updates-when-on-a-local-bra.patch | 19 |
1 files changed, 11 insertions, 8 deletions
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 b90d0c7..0910bec 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,27 +1,30 @@ -From 917df10a7d166fdfb4479ee28c40cb884bfc37dc Mon Sep 17 00:00:00 2001 +From 00aba2082b64d8f01ea796f1118030bd944ebcc6 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(-) + src/main/updater/git.ts | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/updater/git.ts b/src/main/updater/git.ts -index 2ff3ba5..21f33d1 100644 +index 20a5d70..21f33d1 100644 --- a/src/main/updater/git.ts +++ b/src/main/updater/git.ts -@@ -49,9 +49,7 @@ async function getRepo() { +@@ -49,12 +49,7 @@ async function getRepo() { async function calculateGitChanges() { await git("fetch"); -- const branch = await git("branch", "--show-current"); +- const branch = (await git("branch", "--show-current")).stdout.trim(); - -- const res = await git("log", `HEAD...origin/${branch.stdout.trim()}`, "--pretty=format:%an/%h/%s"); +- const existsOnOrigin = (await git("ls-remote", "origin", branch)).stdout.length > 0; +- 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 commits = res.stdout.trim(); return commits ? commits.split("\n").map(line => { -- -2.43.1 +2.44.0 |