From f3e9920e802bb19cd77a463af944dd3fabe3ef90 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Wed, 21 Aug 2024 00:11:21 -0400
Subject: [PATCH] bump: magit

magit/magit@3b37048688e5 -> magit/magit@2da34f1317c6

- Whoops. The HEAD of magit's melpa branch is auto-generated and rebased
  to the front, so pinning to its HEAD will always eventually break.

Fix: #8007
Amend: 5e70fe169764
---
 modules/emacs/vc/packages.el    | 2 +-
 modules/tools/magit/packages.el | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/emacs/vc/packages.el b/modules/emacs/vc/packages.el
index 6fe091a4f..d471201e1 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 "76aa27dfd469fcae75ed7031bb73830831aaccbf")
-(package! git-commit :pin "55656a31cc4fe6c8996c621f4cf14aa4a1bfe47d")
+(package! git-commit :pin "2da34f1317c619ec2dfb9e0d969449261ca7f31f")
 (package! git-timemachine
   ;; The original lives on codeberg.org; which has uptime issues.
   :recipe (:host github :repo "emacsmirror/git-timemachine")
diff --git a/modules/tools/magit/packages.el b/modules/tools/magit/packages.el
index 0c4a6bcc1..ea1a2db1b 100644
--- a/modules/tools/magit/packages.el
+++ b/modules/tools/magit/packages.el
@@ -1,7 +1,10 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; tools/magit/packages.el
 
-(package! magit :pin "3b37048688e50ba5897945ce08eeaed34433c9b7")
+;; NOTE: Always bump this to HEAD~1, not HEAD, because the latest commit on
+;;   magit's melpa branch is auto-generated and moved to HEAD every time there's
+;;   a commit to its main branch.
+(package! magit :pin "2da34f1317c619ec2dfb9e0d969449261ca7f31f")
 (when (modulep! +forge)
   (package! forge :pin "1e7ee99c7f76034e40210a6fd6007015b1998f6d")
   (package! code-review