Commit 0f1d8e77 authored by Robert Speicher's avatar Robert Speicher

Define GIT_TEMPLATE_DIR environment variable in TestEnv

See http://schacon.github.io/git/git-init.html#_template_directory

Without this variable, any global git hooks a developer might have in
~/.git_template would be linked in the `.git/hooks` folder for every
test repository that gets checked out by TestEnv, and would cause
certain specs to fail due to pre-existing hook files.
parent 3d4c2d0b
...@@ -85,7 +85,7 @@ module TestEnv ...@@ -85,7 +85,7 @@ module TestEnv
end end
# We must copy bare repositories because we will push to them. # We must copy bare repositories because we will push to them.
system(*%W(git clone -q --bare #{factory_repo_path} #{factory_repo_path_bare})) system(git_env, *%W(git clone -q --bare #{factory_repo_path} #{factory_repo_path_bare}))
end end
def copy_repo(project) def copy_repo(project)
...@@ -113,4 +113,10 @@ module TestEnv ...@@ -113,4 +113,10 @@ module TestEnv
def factory_repo_name def factory_repo_name
'gitlab-test' 'gitlab-test'
end end
# Prevent developer git configurations from being persisted to test
# repositories
def git_env
{'GIT_TEMPLATE_DIR' => ''}
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment