From 5533ae9a36dc23c3c8ebfcdf6538a86ec14779d7 Mon Sep 17 00:00:00 2001
From: Marien Zwart <marien.zwart@gmail.com>
Date: Sat, 22 Jun 2024 21:32:01 +1000
Subject: [PATCH] Fix conflicting pins of magit and git-commit

https://github.com/doomemacs/doomemacs/commit/62248f836674dcae71c36036276193ad103d070f
updates magit without updating git-commit, which is built from the same
repo.

Pin git-commit to the same newer version (no significant changes).
---
 fetch-overrides.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/fetch-overrides.nix b/fetch-overrides.nix
index 7da012b..e0a95f1 100644
--- a/fetch-overrides.nix
+++ b/fetch-overrides.nix
@@ -42,5 +42,11 @@
     sly-stepper = "da84e3bba8466c2290c2dc7c27d7f4c48c27b39e";
     # In emacsattic, so shouldn't change underneath us.
     ammonite-term-repl = "b552fe21977e005c1c460bf6607557e67241a6b6";
+
+    # Temporarily override git-commit, which Doom pins to an earlier commit than magit
+    # (built from the same repo). When building with straight, the magit pin seems to "win",
+    # making this a non-issue for Doom (since there have been no significant changes to git-commit).
+    # CI should fail again the next time Doom updates magit, so this won't go stale.
+    git-commit = "ea0f07e54967197ac0b072a69ba314314a4080c1";
   };
 }