diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2022-11-17 11:33:55 +0300 |
|---|---|---|
| committer | Christian Couder <chriscool@tuxfamily.org> | 2022-11-17 11:33:55 +0300 |
| commit | 7767d7b2a559bbe96483823d18ebdbf24942dd58 (patch) | |
| tree | 82e71d2210d366dbb5d0f0159964c5eda78f7007 /doc | |
| parent | b35614e815bf1b87f5729e11503a627f203c930f (diff) | |
| parent | e96d17dacddc01d3942a52f177995fb743f90b53 (diff) | |
Merge branch 'doc/update_GIT_VERSION_doc' into 'master'
Document Gitaly Git distribution method
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4864
Merged-by: Christian Couder <chriscool@tuxfamily.org>
Approved-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Co-authored-by: Siddharth Asthana <siddharthasthana31@gmail.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/git-execution-environments.md | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/doc/git-execution-environments.md b/doc/git-execution-environments.md index e4aacd608..76f68053a 100644 --- a/doc/git-execution-environments.md +++ b/doc/git-execution-environments.md @@ -103,14 +103,19 @@ issues we have observed. While we backport patches that have been accepted in the upstream Git project, we do not plan to apply patches that will not eventually end up in Git itself. -To use Gitaly's Git distribution, run `make git`. This Make target automatically -fetches, builds, and installs Git into a specific directory that is configurable -with the `GIT_PREFIX` environment variable. For example, to install the Git -distribution into `/usr/local`: +To use Gitaly's Git distribution, run `make install-git`. This Make target +automatically fetches, builds, and installs Git into a specific directory that +is configurable with the `GIT_PREFIX` environment variable. The version of Git +is configurable using the `GIT_VERSION` environment variable. For example, to +install the Git version 2.37.3 into `/usr/local`: -```shell -make git GIT_PREFIX=/usr/local -``` +1. Run the command `make GIT_VERSION=2.37.3 GIT_PREFIX=/usr/local install-git` + to build Git v2.37.3 and install it in `/usr/local`. +1. Configure Gitaly to use the Git distribution: -Then configure the Git distribution the same way as an external Git -distribution. +```toml +# Git settings +[git] +use_bundled_binaries = false +bin_path = "/usr/local/bin/git" +``` |