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

Merge branch 'use-simple-tmp-ref-path' into 'master'
5506b77c · Sean McGivern · fc292ca0 · e25abf5b · 5506b77c
Commit 5506b77c authored Oct 05, 2017 by Sean McGivern
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

repository.rb lib/gitlab/git/repository.rb +1 -1

No files found.
--- 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)