From 4daa66e016973404da204bc6967ace14525a98de Mon Sep 17 00:00:00 2001 From: Divya Rani Date: Fri, 17 Oct 2025 19:39:41 +0530 Subject: [PATCH] docs: Add Git versions section Now that we are deploying Git from the master branch, this commit adds Git versions section documenting how Git versions are managed. --- doc/git-execution-environments.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/git-execution-environments.md b/doc/git-execution-environments.md index 7619c595f99..ef8adc826c7 100644 --- a/doc/git-execution-environments.md +++ b/doc/git-execution-environments.md @@ -42,3 +42,13 @@ To fix this, Gitaly has to bootstrap a Git execution environment on startup by: To tell Git where to find those symlinks, we run all Git commands with the `GIT_EXEC_PATH` environment variable that points into that temporary execution environment. + +## Switching between Git versions + +Gitaly bundles two versions of Git: + +- The latest version from the `master` branch (using a commit that's at least a week old). This is used by default when the `gitaly_git_master` feature flag is enabled. +- The preceding stable version for rollback purposes, which is used when the feature flag is disabled. + +[`renovate-gitlab-bot`](https://gitlab.com/gitlab-org/frontend/renovate-gitlab-bot) is configured to update the Git versions defined in the Gitaly Makefile and create a +merge request every two weeks. -- GitLab