changes needed for testing purposes

parent 17ada9dd
...@@ -26,7 +26,7 @@ namespace :auto_deploy do ...@@ -26,7 +26,7 @@ namespace :auto_deploy do
$stdout.puts "Cherry-picking for EE..." $stdout.puts "Cherry-picking for EE..."
results = ReleaseTools::CherryPick::Service results = ReleaseTools::CherryPick::Service
.new(ReleaseTools::Project::GitlabEe, version, "#{auto_deploy_branch}-ee") .new(ReleaseTools::Project::GitlabEe, version, auto_deploy_branch)
.dry_run .dry_run
results.each do |result| results.each do |result|
......
...@@ -65,7 +65,8 @@ module ReleaseTools ...@@ -65,7 +65,8 @@ module ReleaseTools
def checkout_new_branch(branch, base: 'master') def checkout_new_branch(branch, base: 'master')
fetch(base) fetch(base)
output, status = run_git %W[checkout --quiet -b #{branch} #{base}] # output, status = run_git %W[checkout --quiet -b #{branch} #{base}]
output, status = run_git %W[checkout --quiet #{branch}]
status.success? || raise(CannotCheckoutBranchError.new(branch, output)) status.success? || raise(CannotCheckoutBranchError.new(branch, output))
end end
......
...@@ -33,7 +33,7 @@ module ReleaseTools ...@@ -33,7 +33,7 @@ module ReleaseTools
private private
def repository def repository
@repository ||= RemoteRepository.get({ origin: origin, upstream: upstream }, global_depth: 200) @repository ||= RemoteRepository.get({ origin: origin, upstream: upstream }, global_depth: nil)
end end
def setup_merge_drivers def setup_merge_drivers
......
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