1 files changed, 2 insertions, 71 deletions
diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile
index 6c6e353e2a30..9345aecfdf54 100644
--- a/devel/gitaly/files/patch-Makefile
+++ b/devel/gitaly/files/patch-Makefile
@@ -1,75 +1,6 @@
---- Makefile.orig	2025-04-16 03:58:04 UTC
+--- Makefile.orig	2025-05-14 17:37:06 UTC
 +++ Makefile
-@@ -151,7 +151,7 @@ GIT_VERSION ?=
- # GIT_VERSION_x_xx defines versions for each instance of bundled Git we ship. When a new
- # major version is added, be sure to update GIT_PACKED_EXECUTABLES, the *-bundled-git targets,
- # and add new targets under the "# These targets build specific releases of Git." section.
--GIT_VERSION_2_48 ?= v2.48.1.gl1
-+#GIT_VERSION_2_48 ?= v2.48.1.gl1
- GIT_VERSION_2_49 ?= v2.49.0.gl1
- #
- # OVERRIDE_GIT_VERSION allows you to specify a custom semver value to be reported by the
-@@ -163,7 +163,7 @@ ifeq (${GIT_VERSION:default=},)
- ifeq (${GIT_VERSION:default=},)
- 	# GIT_VERSION should be overridden to the default version of bundled Git. This is only
- 	# necessary until https://gitlab.com/gitlab-org/gitaly/-/issues/6195 is complete.
--    override GIT_VERSION := ${GIT_VERSION_2_48}
-+    override GIT_VERSION := ${GIT_VERSION_2_49}
-     # When GIT_VERSION is not explicitly set, we default to bundled Git.
- 	export WITH_BUNDLED_GIT = YesPlease
- else
-@@ -259,8 +259,7 @@ BUILD_GEM_NAME ?= gitaly
- BUILD_GEM_NAME ?= gitaly
- 
- # Git binaries that are eventually embedded into the Gitaly binary.
--GIT_PACKED_EXECUTABLES       = $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.48, ${GIT_EXECUTABLES})) \
--                               $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.49, ${GIT_EXECUTABLES}))
-+GIT_PACKED_EXECUTABLES       = $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.49, ${GIT_EXECUTABLES}))
- 
- # All executables provided by Gitaly.
- GITALY_EXECUTABLES           = $(addprefix ${BUILD_DIR}/bin/,$(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print)))
-@@ -349,15 +348,13 @@ install: build
- 
- .PHONY: build-bundled-git
- ## Build bundled Git binaries.
--build-bundled-git: build-bundled-git-v2.48 build-bundled-git-v2.49
--build-bundled-git-v2.48: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.48,${GIT_EXECUTABLES})
-+build-bundled-git: build-bundled-git-v2.49
- build-bundled-git-v2.49: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.49,${GIT_EXECUTABLES})
- 
- .PHONY: install-bundled-git
- ## Install bundled Git binaries. The target directory can be modified by
- ## setting PREFIX and DESTDIR.
--install-bundled-git: install-bundled-git-v2.48 install-bundled-git-v2.49
--install-bundled-git-v2.48: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.48,${GIT_EXECUTABLES})
-+install-bundled-git: install-bundled-git-v2.49
- install-bundled-git-v2.49: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.49,${GIT_EXECUTABLES})
- 
- ifdef WITH_BUNDLED_GIT
-@@ -679,17 +676,17 @@ ${DEPENDENCY_DIR}/git-distribution/build/git: ${DEPEND
- 	${Q}touch $@
- 
- # These targets build specific releases of Git.
--${BUILD_DIR}/bin/gitaly-%-v2.48: override GIT_VERSION = ${GIT_VERSION_2_48}
-+#${BUILD_DIR}/bin/gitaly-%-v2.48: override GIT_VERSION = ${GIT_VERSION_2_48}
- ${BUILD_DIR}/bin/gitaly-%-v2.49: override GIT_VERSION = ${GIT_VERSION_2_49}
- 
- ifdef USE_MESON
--${BUILD_DIR}/bin/gitaly-%-v2.48: ${DEPENDENCY_DIR}/git-v2.48/build/% | ${BUILD_DIR}/bin
--	${Q}install $< $@
-+#${BUILD_DIR}/bin/gitaly-%-v2.48: ${DEPENDENCY_DIR}/git-v2.48/build/% | ${BUILD_DIR}/bin
-+#	${Q}install $< $@
- ${BUILD_DIR}/bin/gitaly-%-v2.49: ${DEPENDENCY_DIR}/git-v2.49/build/% | ${BUILD_DIR}/bin
- 	${Q}install $< $@
- else
--${BUILD_DIR}/bin/gitaly-%-v2.48: ${DEPENDENCY_DIR}/git-v2.48/% | ${BUILD_DIR}/bin
--	${Q}install $< $@
-+#${BUILD_DIR}/bin/gitaly-%-v2.48: ${DEPENDENCY_DIR}/git-v2.48/% | ${BUILD_DIR}/bin
-+#	${Q}install $< $@
- ${BUILD_DIR}/bin/gitaly-%-v2.49: ${DEPENDENCY_DIR}/git-v2.49/% | ${BUILD_DIR}/bin
- 	${Q}install $< $@
- endif
-@@ -726,12 +723,12 @@ ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/gi
+@@ -717,12 +717,12 @@ ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/gi
  # otherwise try to rebuild all targets depending on it whenever we build
  # something else. We thus depend on the Makefile instead.
  ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/git-%.version