Skip to content

Use git provided by Gitaly

Patrick Steinhardt requested to merge pks-git-via-gitaly into master

What does this MR do?

Historically, it's been quite a hassle to upgrade the git version across all components of GitLab. This led to diverging git distributions where we had different versions, patches and compile flags in use in different parts of the stack.

To fix this problem, we are converting downstream distributions of Gitaly to use a single source of truth for building git, which is hosted by the Gitaly project: a simple make git will compile the currently recommended git version. As such, updates of the recommended version will automatically propagate through the stack. This allows for for a unified git installation across all of our stack and enables quicker iteration when e.g. mission-critical patches or security updates are required or simply when updating the minimum required git version.

Note that this commit also drops all of the custom patches which we currently have in git. This is because Gitaly has already bumped the default git version to v2.31.0, which contains all of them.

Related issues

gitaly#3512 (closed) &3196 (closed) #5354 (closed)

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion

Required

  • Merge Request Title, and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com
  • Pipeline is green on dev.gitlab.org if the change is touching anything besides documentation or internal cookbooks
  • trigger-package has a green pipeline running against latest commit

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Tests added
  • Integration tests added to GitLab QA
  • Equivalent MR/issue for the GitLab Chart opened
Edited by Patrick Steinhardt

Merge request reports