From 7115a24fcd05fa83865e3e5b049d344a7d05a979 Mon Sep 17 00:00:00 2001
From: Bryce Kwon <bryce@brycekwon.com>
Date: Wed, 5 Aug 2026 20:23:12 -1000
Subject: Update the bundled Git to 2.55.0

---
 Makefile | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8c07692..010427b 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ CGIT_ROOT = ../..
 
 # Git release fetched by get-git when the submodule is not checked out. Keep in
 # step with the submodule pin in .gitmodules.
-GIT_VERSION = 2.54.0
+GIT_VERSION = 2.55.0
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VERSION).tar.xz
 
 # Compiled-in cgit defaults, overridable through cgit.conf. All carry the CGIT_
@@ -67,13 +67,21 @@ all: cgit
 
 # cgit is compiled inside the bundled Git tree so it can reuse Git's build
 # machinery (see source/cgit.mk). Objects and the binary go to build/.
+#
+# NO_RUST keeps Cargo out of the build. Git 2.55 inverted the flag that used
+# to be WITH_RUST, so Rust is now compiled in unless it is turned off, and
+# leaving this out would quietly make Cargo a build requirement. Git 3.0 drops
+# the choice entirely, at which point this stops working and Rust becomes
+# mandatory.
+GIT_BUILD_FLAGS = NO_CURL=1 NO_OPENSSL=1 NO_RUST=1
+
 cgit:
 	+@$(MAKE) -C $(GITDIR) -f $(CGIT_ROOT)/$(SRCDIR)/cgit.mk \
-		$(CGIT_ROOT)/$(BUILDDIR)/cgit $(EXTRA_GIT_TARGETS) NO_CURL=1 NO_OPENSSL=1
+		$(CGIT_ROOT)/$(BUILDDIR)/cgit $(EXTRA_GIT_TARGETS) $(GIT_BUILD_FLAGS)
 
 sparse:
 	+@$(MAKE) -C $(GITDIR) -f $(CGIT_ROOT)/$(SRCDIR)/cgit.mk \
-		NO_CURL=1 NO_OPENSSL=1 cgit-sparse
+		$(GIT_BUILD_FLAGS) cgit-sparse
 
 test: cgit-with-git
 	+@$(MAKE) -C tests all
-- 
cgit v2.8.0