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

Revert to stable version of magit, temporarily

Browse source 
Magit introduced some breaking changes in a recent commit that breaks
evil-magit and magithub. Magithub appears to be migrating to forge, so
until evil-magit has updated and I've properly replaced magithub with
forge, we'll use an earlier version of magit instead.
This commit is contained in:
Henrik Lissner 2019-02-14 23:47:29 -05:00
parent 2054f6b35a
commit 33ef90343e
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/tools/magit/config.el
View file

@ -99,6 +99,7 @@ what features are available.")
"gj" #'git-rebase-move-line-down "gj" #'git-rebase-move-line-down
"gk" #'git-rebase-move-line-up))) "gk" #'git-rebase-move-line-up)))
(def-package! forge (def-package! forge
:when (featurep! :tools magit +forge) :when (featurep! :tools magit +forge)
:after magit :after magit

9
modules/tools/magit/packages.el
View file

@ -1,7 +1,14 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; tools/magit/packages.el ;;; tools/magit/packages.el
(when (package! magit) ;; Magit introduced some breaking changes in a recent commit that breaks
;; evil-magit and magithub.
;; TODO Once those packages have updated, we'll go back to tracking magit HEAD
(when (package! magit :recipe
(:fetcher github
:repo "magit/magit"
:commit "78114e6425d5e7d6eaa7712c845f28694aa7faeb"
:files ("lisp/magit" "lisp/magit*.el" "lisp/git-rebase.el")))
(package! magit-gitflow) (package! magit-gitflow)
(if (featurep! +forge) (if (featurep! +forge)
(package! forge) (package! forge)