Pass relevant git environment variables while calling `/allowed`
- 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.
-
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. -
We fix this by passing the relevant environment variables (
GIT_ALTERNATE_OBJECT_DIRECTORIES
,GIT_OBJECT_DIRECTORY
, andGIT_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
Activity
added 1 commit
- 36fb48dc - Pass relevant git environment variables while calling
/allowed
- 36fb48dc - Pass relevant git environment variables while calling
assigned to @dbalexandre
@timothyandrew LGTM
assigned to @timothyandrew
@dbalexandre: Great! Can you merge this along with gitlab-org/gitlab-ce!7967?
Edited by username-removed-407765assigned to @dbalexandre
@timothyandrew Please add a CHANGELOG entry.
@rymai Could you review the MR for me, please? Thanks :)
assigned to @timothyandrew
assigned to @dbalexandre
assigned to @rymai
@timothyandrew Thanks, looks good to me!
mentioned in commit a3712cc1
mentioned in merge request !120 (merged)
mentioned in commit test-nick/gitlab-ce@2f19d7d9
mentioned in commit test-nick/gitlab-ce@2c080b39
mentioned in commit test-nick/gitlab-ce@2521a0b4
mentioned in commit test-nick/gitlab-ce@82cae379