summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-10-02 09:52:35 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-10-02 09:52:35 +0000
commit42d7d355805e544513fc89dcb037caf436770a25 (patch)
tree8c100434998b496194815b2eed93d34619097329
parentaa445119da3898ed96c8226526b3a3329b7c99ad (diff)
parentf3f304dc06231b7fb5af71607a5a61574bd9a0ac (diff)
downloadgitlab-ce-42d7d355805e544513fc89dcb037caf436770a25.tar.gz
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
-rw-r--r--changelogs/unreleased/sh-restore-all-refs-backup.yml5
-rw-r--r--lib/backup/repository.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/sh-restore-all-refs-backup.yml b/changelogs/unreleased/sh-restore-all-refs-backup.yml
new file mode 100644
index 00000000000..eaac0c71dd0
--- /dev/null
+++ b/changelogs/unreleased/sh-restore-all-refs-backup.yml
@@ -0,0 +1,5 @@
+---
+title: Ensure all refs are restored on a restore from backup
+merge_request:
+author:
+type: fixed
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index 4e92be85110..3ad09a1b421 100644
--- 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