diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index 2bf658fdd..882a637bd 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -99,6 +99,7 @@ what features are available.") "gj" #'git-rebase-move-line-down "gk" #'git-rebase-move-line-up))) + (def-package! forge :when (featurep! :tools magit +forge) :after magit diff --git a/modules/tools/magit/packages.el b/modules/tools/magit/packages.el index 5eac2f2a5..93d158c0c 100644 --- a/modules/tools/magit/packages.el +++ b/modules/tools/magit/packages.el @@ -1,7 +1,14 @@ ;; -*- no-byte-compile: t; -*- ;;; 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) (if (featurep! +forge) (package! forge)