summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-10-02 09:52:35 +0000
committerRobert Speicher <rspeicher@gmail.com>2017-10-02 11:55:39 +0200
commit585acd18022972bbee3fa2a27340fd16d06b6b29 (patch)
tree3ce46aab5667e46cd897aad0591533c5c62b7bbe
parent450c98a6c0ff20e33383e2c5b04dfd6243599db6 (diff)
downloadgitlab-ce-585acd18022972bbee3fa2a27340fd16d06b6b29.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