gitback/doomemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle git submodules from 'doom update'

Browse Source
This commit is contained in:
Henrik Lissner 2019-08-22 13:02:24 -04:00
parent 8f1de7c998
commit eb567f51c8
No known key found for this signature in database
GPG Key ID: 5F6C0EA160557395
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/cli/packages.el
View File

@ -150,7 +150,7 @@ a list of packages that will be installed."
(dolist (recipe ',group)
(when (straight--repository-is-available-p recipe)
(straight-vc-git--destructure recipe
(package local-repo upstream-remote upstream-repo upstream-host)
(package local-repo nonrecursive upstream-remote upstream-repo upstream-host)
(condition-case e
(let ((default-directory (straight--repos-dir local-repo)))
;; HACK We normalize packages to avoid certain scenarios
@ -162,6 +162,8 @@ a list of packages that will be installed."
(shell-command-to-string "git merge --abort")
(straight--get-call "git" "reset" "--hard")
(straight--get-call "git" "clean" "-ffd")
(unless nonrecursive
(shell-command-to-string "git submodule update --init --recursive"))
(when upstream-repo
(let ((desired-url (straight-vc-git--encode-url upstream-repo upstream-host))
(actual-url (condition-case nil