From 2b08b2da332bf3119ef027fe094eebc77e1150b3 Mon Sep 17 00:00:00 2001 From: Noisy Computation Date: Tue, 19 Sep 2023 14:12:59 -0600 Subject: [PATCH] bump: :emacs vc magit/magit@97a95f70079b -> magit/magit@48818355728c The pinned version of `magit` in `:tools magit` needs be the same as that of `git-commit` in `:emacs vc`. `straight.el` prepares the repo only once, and if `git-commit` is processed first, its pinned version wins out and the more recent pinning of `magit` is ignored. As noted in #7363, processing order may be non-deterministic, so the inconsistent pinning may not be apparent on every system. Fix: #7363 Amend: #7277 Amend: 7c63b353d290 --- modules/emacs/vc/packages.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/emacs/vc/packages.el b/modules/emacs/vc/packages.el index 23cd57473..39ad6dc4c 100644 --- a/modules/emacs/vc/packages.el +++ b/modules/emacs/vc/packages.el @@ -6,7 +6,7 @@ (package! smerge-mode :built-in t) (package! browse-at-remote :pin "c020975a891438e278ad1855213d4f3d62c9fccb") -(package! git-commit :pin "97a95f70079b6613bf98d2306279d3e03fe51234") +(package! git-commit :pin "48818355728c48d986d74dde8b1e9fba25f0fd53") (package! git-timemachine ;; The original lives on codeberg.org; which has uptime issues. :recipe (:host github :repo "emacsmirror/git-timemachine")