Merge branch 'sh-restore-all-refs-backup' into 'master'

Ensure all refs are restored on a backup/restore Closes #38352 See merge request gitlab-org/gitlab-ce!14595

Merge branch 'sh-restore-all-refs-backup' into 'master'
585acd18 · Sean McGivern · Robert Speicher · 450c98a6 · 585acd18 · 585acd18
Commit 585acd18 authored Oct 02, 2017 by Sean McGivern Committed by Robert Speicher Oct 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

sh-restore-all-refs-backup.yml changelogs/unreleased/sh-restore-all-refs-backup.yml +5 -0

repository.rb lib/backup/repository.rb +1 -1

No files found.
--- a/changelogs/unreleased/sh-restore-all-refs-backup.yml
+++ b/changelogs/unreleased/sh-restore-all-refs-backup.yml
+---
+title: Ensure all refs are restored on a restore from backup
+merge_request:
+author:
+type: fixed
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -78,7 +78,7 @@ module Backup
        project.ensure_storage_path_exists

        cmd = if File.exist?(path_to_project_bundle)
-                %W(#{Gitlab.config.git.bin_path} clone --bare #{path_to_project_bundle} #{path_to_project_repo})
+                %W(#{Gitlab.config.git.bin_path} clone --bare --mirror #{path_to_project_bundle} #{path_to_project_repo})
              else
                %W(#{Gitlab.config.git.bin_path} init --bare #{path_to_project_repo})
              end