lib/gitlab_git/repository.rb in gitlab_git-5.6.0 vs lib/gitlab_git/repository.rb in gitlab_git-5.7.0
- old
+ new
@@ -107,15 +107,15 @@
def discover_default_branch
if branch_names.length == 0
nil
elsif branch_names.length == 1
branch_names.first
- elsif rugged.head
+ elsif rugged.head && branch_names.include?(Ref.extract_branch_name(rugged.head.name))
Ref.extract_branch_name(rugged.head.name)
elsif branch_names.include?("master")
"master"
- elsif
+ else
branch_names.first
end
end
# Archive Project to .tar.gz
@@ -133,10 +133,10 @@
pipe_cmd = nil
case format
when "tar.bz2", "tbz", "tbz2", "tb2", "bz2"
extension = ".tar.bz2"
- pipe_cmd = "bzip"
+ pipe_cmd = "bzip2"
when "tar"
extension = ".tar"
pipe_cmd = "cat"
when "zip"
extension = ".zip"