Revert "Pass correct tag target to post-receive hook when creating tag via UI"
This reverts commit ae51774bc4
.
This commit is contained in:
parent
6ea0b8d563
commit
9e6cdc6474
|
@ -196,18 +196,11 @@ class Repository
|
|||
|
||||
options = { message: message, tagger: user_to_committer(user) } if message
|
||||
|
||||
rugged.tags.create(tag_name, target, options)
|
||||
tag = find_tag(tag_name)
|
||||
|
||||
GitHooksService.new.execute(user, path_to_repo, oldrev, tag.target, ref) do
|
||||
# we already created a tag, because we need tag SHA to pass correct
|
||||
# values to hooks
|
||||
GitHooksService.new.execute(user, path_to_repo, oldrev, target, ref) do
|
||||
rugged.tags.create(tag_name, target, options)
|
||||
end
|
||||
|
||||
tag
|
||||
rescue GitHooksService::PreReceiveError
|
||||
rugged.tags.delete(tag_name)
|
||||
raise
|
||||
find_tag(tag_name)
|
||||
end
|
||||
|
||||
def rm_branch(user, branch_name)
|
||||
|
|
|
@ -1303,28 +1303,6 @@ describe Repository, models: true do
|
|||
repository.add_tag(user, '8.5', 'master', 'foo')
|
||||
end
|
||||
|
||||
it 'does not create a tag when a pre-hook fails' do
|
||||
allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return([false, ''])
|
||||
|
||||
expect do
|
||||
repository.add_tag(user, '8.5', 'master', 'foo')
|
||||
end.to raise_error(GitHooksService::PreReceiveError)
|
||||
|
||||
repository.expire_tags_cache
|
||||
expect(repository.find_tag('8.5')).to be_nil
|
||||
end
|
||||
|
||||
it 'passes tag SHA to hooks' do
|
||||
spy = GitHooksService.new
|
||||
allow(GitHooksService).to receive(:new).and_return(spy)
|
||||
allow(spy).to receive(:execute).and_call_original
|
||||
|
||||
tag = repository.add_tag(user, '8.5', 'master', 'foo')
|
||||
|
||||
expect(spy).to have_received(:execute).
|
||||
with(anything, anything, anything, tag.target, anything)
|
||||
end
|
||||
|
||||
it 'returns a Gitlab::Git::Tag object' do
|
||||
tag = repository.add_tag(user, '8.5', 'master', 'foo')
|
||||
|
||||
|
|
Loading…
Reference in New Issue