From fe51fa26a777f239dc4a09f531b54162f9f949fc Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 15 Jun 2015 17:54:22 +0200 Subject: Dont set checkout sha for removed branch/tag Signed-off-by: Dmitriy Zaporozhets --- lib/gitlab/push_data_builder.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/push_data_builder.rb b/lib/gitlab/push_data_builder.rb index f97784f5abb..d010ade704e 100644 --- a/lib/gitlab/push_data_builder.rb +++ b/lib/gitlab/push_data_builder.rb @@ -27,7 +27,7 @@ module Gitlab # Get latest 20 commits ASC commits_limited = commits.last(20) - + # For performance purposes maximum 20 latest commits # will be passed as post receive hook data. commit_attrs = commits_limited.map(&:hook_attrs) @@ -70,8 +70,11 @@ module Gitlab end def checkout_sha(repository, newrev, ref) + # Checkout sha is nil when we remove branch or tag + return if Gitlab::Git.blank_ref?(newrev) + # Find sha for tag, except when it was deleted. - if Gitlab::Git.tag_ref?(ref) && !Gitlab::Git.blank_ref?(newrev) + if Gitlab::Git.tag_ref?(ref) tag_name = Gitlab::Git.ref_name(ref) tag = repository.find_tag(tag_name) -- cgit v1.2.1