From 2cf91badf88db944c48b3516823e5712ed74cb89 Mon Sep 17 00:00:00 2001 From: James Conroy-Finn Date: Wed, 24 Feb 2021 21:52:11 +0000 Subject: [PATCH] Enable disabling of magit-gitflow Disabling magit-gitflow breaks magit-dispatch due to the unconditional application of `transient-replace-suffix`. With this change it is possible to disable magit-gitflow by adding the following to your private Doom configuration: (package! magit-gitflow :disable t) --- modules/tools/magit/config.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index 71c85793d..b4d2c2ac3 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -233,7 +233,10 @@ ensure it is built when we actually use Forge." (evil-define-key* evil-collection-magit-state git-rebase-mode-map "gj" #'git-rebase-move-line-down "gk" #'git-rebase-move-line-up)) - (transient-replace-suffix 'magit-dispatch 'magit-worktree - '("%" "Gitflow" magit-gitflow-popup)) + + (after! magit-gitflow + (transient-replace-suffix 'magit-dispatch 'magit-worktree + '("%" "Gitflow" magit-gitflow-popup))) + (transient-append-suffix 'magit-dispatch '(0 -1 -1) '("*" "Worktree" magit-worktree)))