Commit f2464a13 authored by Douwe Maan's avatar Douwe Maan

Don't require start branch to exist if we're just creating a new branch

parent e7bf621a
...@@ -56,14 +56,17 @@ class GitOperationService ...@@ -56,14 +56,17 @@ class GitOperationService
start_project: repository.project, start_project: repository.project,
&block) &block)
start_branch_name ||= branch_name start_repository = start_project.repository
start_branch_name = nil if start_repository.empty_repo?
verify_start_branch_exists!(start_project.repository, start_branch_name) if start_branch_name && !start_repository.branch_exists?(start_branch_name)
raise ArgumentError, "Cannot find branch #{start_branch_name} in #{start_repository.path_with_namespace}"
end
update_branch_with_hooks(branch_name) do update_branch_with_hooks(branch_name) do
repository.with_repo_branch_commit( repository.with_repo_branch_commit(
start_project.repository, start_repository,
start_branch_name, start_branch_name || branch_name,
&block) &block)
end end
end end
...@@ -150,11 +153,4 @@ class GitOperationService ...@@ -150,11 +153,4 @@ class GitOperationService
repository.raw_repository.autocrlf = :input repository.raw_repository.autocrlf = :input
end end
end end
def verify_start_branch_exists!(start_repository, start_branch_name)
return if start_repository.empty_repo?
return if start_repository.branch_exists?(start_branch_name)
raise ArgumentError, "Cannot find branch #{start_branch_name} in #{start_repository.path_with_namespace}"
end
end end
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