diff options
| author | David Morgan <djm_uk@protonmail.com> | 2024-08-22 15:04:37 +0100 |
|---|---|---|
| committer | David Morgan <djm_uk@protonmail.com> | 2024-08-22 15:04:37 +0100 |
| commit | a59addddf96da11e62c562079858ab6c0c69bf64 (patch) | |
| tree | cba1da4e5d4d1999eb186275e350d6edb145a04e /.emacs.d | |
| parent | 8d2afe600a9facaea1a1bec75355b0c5c1380225 (diff) | |
| download | dotfiles-a59addddf96da11e62c562079858ab6c0c69bf64.tar.gz | |
Use the main branch for magit and related packages
Diffstat (limited to '.emacs.d')
| -rw-r--r-- | .emacs.d/lisp/init-git.el | 9 | ||||
| -rw-r--r-- | .emacs.d/lisp/init-packages.el | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/.emacs.d/lisp/init-git.el b/.emacs.d/lisp/init-git.el index 1d7183e..4863b75 100644 --- a/.emacs.d/lisp/init-git.el +++ b/.emacs.d/lisp/init-git.el @@ -71,6 +71,7 @@ (message "not a git repository")))) (use-package magit + :ensure (magit :branch "main") :bind ("C-c g g" . magit-dispatch) ;; magit-file-dispatch is C-c M-g ("C-c g u" . my/magit-set-upstream) @@ -303,9 +304,17 @@ (magit-refresh))) (use-package forge + :ensure (forge :branch "main") :after magit :bind (:map forge-pullreq-list-mode-map ("C-w" . forge-copy-url-at-point-as-kill))) +;; ghub and with-editor are dependencies of magit, but we need to force them to use the main branch +(use-package ghub + :ensure (ghub :branch "main")) + +(use-package with-editor + :ensure (with-editor :branch "main")) + (use-package git-link :config (defun git-link-on-branch () diff --git a/.emacs.d/lisp/init-packages.el b/.emacs.d/lisp/init-packages.el index 48080d8..364a063 100644 --- a/.emacs.d/lisp/init-packages.el +++ b/.emacs.d/lisp/init-packages.el @@ -85,7 +85,7 @@ elpaca--pre-built-steps elpaca-build-steps)) (list '+elpaca-unload-transient 'elpaca--activate-package))) -(elpaca `(transient :build ,(+elpaca-transient-build-steps))) +(elpaca `(transient :branch "main" :build ,(+elpaca-transient-build-steps))) ;; Block until current queue processed. (elpaca-wait) |