From 544e579c448e83b4600ded44f6f997bbfbee1b8b Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 28 Mar 2024 09:43:43 -0400 Subject: [PATCH] fix(cli): doom upgrade: ensure upgrade remote is deleted It seems the temporary branch that 'doom upgrade' creates is sometimes left over after a 'doom upgrade', preventing the next 'git fetch' from completing. Ref: #7771 --- lisp/cli/upgrade.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/cli/upgrade.el b/lisp/cli/upgrade.el index 78218de17..13614c62a 100644 --- a/lisp/cli/upgrade.el +++ b/lisp/cli/upgrade.el @@ -99,6 +99,8 @@ following shell commands: (sh! "git" "reset" "--hard" (format "origin/%s" branch)) (sh! "git" "clean" "-ffd"))) + ;; In case of leftover state from a partial/incomplete 'doom upgrade' + (sh! "git" "branch" "-D" target-remote) (sh! "git" "remote" "remove" doom-upgrade-remote) (unwind-protect (let (result)