mirror of
https://github.com/doomemacs/doomemacs
synced 2025-08-03 12:27:26 -05:00
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
This commit is contained in:
@ -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)
|
||||
|
Reference in New Issue
Block a user