From b093ee83a2038b3f7fd8fbed5d02e0089408551d 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 1955f7d..0226565 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.46.1