Skip to content

Pass relevant git environment variables while calling `/allowed`

username-removed-407765 requested to merge 25301-git-2.11-force-push-bug into master
  1. Starting version 2.11, git changed the way the pre-receive flow works.
  • Previously, the new potential objects would be added to the main repo. If the pre-receive passes, the new objects stay in the repo but are linked up. If the pre-receive fails, the new objects stay orphaned in the repo, and are cleaned up during the next git gc.
  • In 2.11, the new potential objects are added to a temporary "alternate object directory", that git creates for this purpose. If the pre-receive passes, the objects from the alternate object directory are migrated to the main repo. If the pre-receive fails the alternate object directory is simply deleted.

  1. In our workflow, the pre-recieve script calls the /allowed endpoint on the rails server. This /allowed endpoint calls out directly to git to perform various checks. These direct calls to git do not have the necessary environment variables set which allow access to the "alternate object directory" (explained above). Therefore these calls to git are not able to access any of the new potential objects to be added during this push.

  2. We fix this by passing the relevant environment variables (GIT_ALTERNATE_OBJECT_DIRECTORIES, GIT_OBJECT_DIRECTORY, and GIT_QUARANTINE_PATH) to the /allowed endpoint, which will then include these environment variables while calling out to git.

  • Related to gitlab-org/gitlab-ce#25301.
  • Corresponding backend MR: gitlab-org/gitlab-ce!7967
  • Corresponding EE MR: gitlab-org/gitlab-ee!964

Merge request reports