summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-10-05 10:37:50 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-10-05 10:37:50 +0000
commit5506b77ce36eb139c7c6b198cfd281bcee49df40 (patch)
tree2ea4e96d0b69b6ba9c80782cfe9db57dece83aa5 /lib
parentfc292ca032bf25c05e3635be589c6ae2c6ad47e4 (diff)
parente25abf5be63a6fc124d9fb33d042897fb2a09d82 (diff)
downloadgitlab-ce-5506b77ce36eb139c7c6b198cfd281bcee49df40.tar.gz
Merge branch 'use-simple-tmp-ref-path' into 'master'
Use simple path for tmp ref, avoiding extra directory See merge request gitlab-org/gitlab-ce!14698
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/git/repository.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 89b654253cb..e42bbb659b4 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -990,7 +990,7 @@ module Gitlab
tmp_ref = fetch_ref(
start_repository,
source_ref: "#{Gitlab::Git::BRANCH_REF_PREFIX}#{start_branch_name}",
- target_ref: "refs/tmp/#{SecureRandom.hex}/head"
+ target_ref: "refs/tmp/#{SecureRandom.hex}"
)
yield commit(sha)