Commit ca685f80 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Since now fetch_ref is reliable, we could just rely on it

parent 501be36c
...@@ -989,12 +989,10 @@ class Repository ...@@ -989,12 +989,10 @@ class Repository
if start_repository == self if start_repository == self
start_branch_name start_branch_name
else else
tmp_ref = "refs/tmp/#{SecureRandom.hex}/head" tmp_ref = fetch_ref(
fetch_ref(
start_repository.path_to_repo, start_repository.path_to_repo,
"#{Gitlab::Git::BRANCH_REF_PREFIX}#{start_branch_name}", "#{Gitlab::Git::BRANCH_REF_PREFIX}#{start_branch_name}",
tmp_ref "refs/tmp/#{SecureRandom.hex}/head"
) )
start_repository.commit(start_branch_name).sha start_repository.commit(start_branch_name).sha
...@@ -1003,7 +1001,7 @@ class Repository ...@@ -1003,7 +1001,7 @@ class Repository
yield(commit(branch_name_or_sha)) yield(commit(branch_name_or_sha))
ensure ensure
rugged.references.delete(tmp_ref) if tmp_ref && ref_exists?(tmp_ref) rugged.references.delete(tmp_ref) if tmp_ref
end end
def add_remote(name, url) def add_remote(name, url)
...@@ -1029,6 +1027,8 @@ class Repository ...@@ -1029,6 +1027,8 @@ class Repository
# Make sure ref was created, and raise Rugged::ReferenceError when not # Make sure ref was created, and raise Rugged::ReferenceError when not
raise Rugged::ReferenceError, message if status != 0 raise Rugged::ReferenceError, message if status != 0
target_ref
end end
def create_ref(ref, ref_path) def create_ref(ref, ref_path)
......
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