Merge branch 'retain-default-branch-on-import' into 'master'

Set proper default-branch on GitHub Import

Closes #59347

See merge request gitlab-org/gitlab-ce!26476

changelogs/unreleased/retain-default-branch-on-import.yml

+---
+title: Set proper default-branch for repository on GitHub Import
+merge_request: 26476
+author:
+type: fixed

lib/gitlab/github_import/importer/repository_importer.rb

@@ -5,6 +5,7 @@ module GithubImport
     module Importer
       class RepositoryImporter
         include Gitlab::ShellAdapter
+        include Gitlab::Utils::StrongMemoize
 
         attr_reader :project, :client, :wiki_formatter
 
@@ -17,7 +18,7 @@ def initialize(project, client)
         # Returns true if we should import the wiki for the project.
         # rubocop: disable CodeReuse/ActiveRecord
         def import_wiki?
-          client.repository(project.import_source)&.has_wiki &&
+          client_repository&.has_wiki &&
             !project.wiki_repository_exists? &&
             Gitlab::GitalyClient::RemoteService.exists?(wiki_url)
         end
@@ -52,6 +53,7 @@ def import_repository
           refmap = Gitlab::GithubImport.refmap
           project.repository.fetch_as_mirror(project.import_url, refmap: refmap, forced: true, remote_name: 'github')
 
+          project.change_head(default_branch) if default_branch
           true
         rescue Gitlab::Git::Repository::NoRepository, Gitlab::Shell::Error => e
           fail_import("Failed to import the repository: #{e.message}")
@@ -82,6 +84,18 @@ def fail_import(message)
           project.import_state.mark_as_failed(message)
           false
         end
+
+        private
+
+        def default_branch
+          client_repository&.default_branch
+        end
+
+        def client_repository
+          strong_memoize(:client_repository) do
+            client.repository(project.import_source)
+          end
+        end
       end
     end
   end

spec/lib/gitlab/github_import/importer/repository_importer_spec.rb

@@ -179,6 +179,17 @@
 
   describe '#import_repository' do
     it 'imports the repository' do
+      repo = double(:repo, default_branch: 'develop')
+
+      expect(client)
+        .to receive(:repository)
+        .with('foo/bar')
+        .and_return(repo)
+
+      expect(project)
+        .to receive(:change_head)
+        .with('develop')
+
       expect(project)
         .to receive(:ensure_repository)