From df7d165228846d51beba93aaf133809d8f4824d4 Mon Sep 17 00:00:00 2001 From: 1024x2 Date: Tue, 13 Aug 2024 21:08:35 +0100 Subject: Move patches into a folder --- ...-t-prompt-for-updates-when-on-a-local-bra.patch | 30 ---------------------- 1 file changed, 30 deletions(-) delete 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 deleted file mode 100644 index 946e723..0000000 --- a/0004-Updater-don-t-prompt-for-updates-when-on-a-local-bra.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f4765b5c9993bdf05527a8ad82b626be0e9aa12e Mon Sep 17 00:00:00 2001 -From: 1024x2 <2pow11@gmail.com> -Date: Sat, 9 Mar 2024 08:00:55 +0000 -Subject: [PATCH 4/8] Updater: don't prompt for updates when on a local branch - ---- - 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 1955f7dc..0226565e 100644 ---- a/src/main/updater/git.ts -+++ b/src/main/updater/git.ts -@@ -49,12 +49,7 @@ async function getRepo() { - async function calculateGitChanges() { - await git("fetch"); - -- const branch = (await git("branch", "--show-current")).stdout.trim(); -- -- 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.45.2 - -- cgit v1.2.3