emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4341 from rgrinberg/fix-doom-upgrade

Browse source 
Fix doom upgrade
This commit is contained in:
Henrik Lissner 2020-11-29 19:34:54 -05:00 • committed by GitHub
commit cb32e459e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/cli/upgrade.el
View file

@ -58,7 +58,7 @@ following shell commands:
(branch (replace-regexp-in-string (branch (replace-regexp-in-string
"^\\(?:[^/]+/[^/]+/\\)?\\(.+\\)\\(?:~[0-9]+\\)?$" "\\1" "^\\(?:[^/]+/[^/]+/\\)?\\(.+\\)\\(?:~[0-9]+\\)?$" "\\1"
(cdr (doom-call-process "git" "name-rev" "--name-only" "HEAD")))) (cdr (doom-call-process "git" "name-rev" "--name-only" "HEAD"))))
(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)
"Couldn't find Doom's .git directory. Was Doom cloned properly?" "Couldn't find Doom's .git directory. Was Doom cloned properly?"
@ -80,7 +80,7 @@ following shell commands:
(let (result) (let (result)
(or (zerop (car (doom-call-process "git" "remote" "add" doom-repo-remote doom-repo-url))) (or (zerop (car (doom-call-process "git" "remote" "add" doom-repo-remote doom-repo-url)))
(error "Failed to add %s to remotes" doom-repo-remote)) (error "Failed to add %s to remotes" doom-repo-remote))
(or (zerop (car (setq result (doom-call-process "git" "fetch" "--tags" doom-repo-remote branch)))) (or (zerop (car (setq result (doom-call-process "git" "fetch" "--tags" doom-repo-remote (format "%s:%s" branch target-remote)))))
(error "Failed to fetch from upstream")) (error "Failed to fetch from upstream"))
(let ((this-rev (cdr (doom-call-process "git" "rev-parse" "HEAD"))) (let ((this-rev (cdr (doom-call-process "git" "rev-parse" "HEAD")))