awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-01 12:17:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'doom upgrade' when doom is a git submodule

Browse Source
This commit is contained in:
Henrik Lissner
2020-05-26 02:13:02 -04:00
parent 101cd5019f
commit e89b604f5f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/cli/upgrade.el
View File

@ -50,7 +50,10 @@ following shell commands:
process-file-side-effects) process-file-side-effects)
(print! (start "Preparing to upgrade Doom Emacs and its packages...")) (print! (start "Preparing to upgrade Doom Emacs and its packages..."))
(let* ((branch (vc-git--symbolic-ref doom-emacs-dir)) (let* ((branch
(string-trim-right
(cdr (doom-call-process "git" "name-rev" "--name-only" "HEAD"))
"~[0-9]$"))
(target-remote (format "%s/%s" doom-repo-remote branch))) (target-remote (format "%s/%s" doom-repo-remote branch)))
(unless branch (unless branch
(error! (if (file-exists-p! ".git" doom-emacs-dir) (error! (if (file-exists-p! ".git" doom-emacs-dir)