diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-09-29 15:10:36 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-09-29 15:17:05 -0700 |
| commit | f3f304dc06231b7fb5af71607a5a61574bd9a0ac (patch) | |
| tree | a2f3b64f50aed5e23f85f23cba85698efad9dda3 | |
| parent | 171714c9231deb95136088ba1c0621379467de39 (diff) | |
| download | gitlab-ce-f3f304dc06231b7fb5af71607a5a61574bd9a0ac.tar.gz | |
Ensure all refs are restored on a restore from backupsh-restore-all-refs-backup
To restore all refs from a bundle, we need to use the --mirror option to
ensure that all refs are properly restored. Without this, refs such as
`refs/merge-requests/X` and `refs/keep-around/Y` would be omitted, which
exposed a bug as described in https://gitlab.com/gitlab-org/gitlab-ce/issues/38319#note_41648608.
Closes #38352
| -rw-r--r-- | changelogs/unreleased/sh-restore-all-refs-backup.yml | 5 | ||||
| -rw-r--r-- | lib/backup/repository.rb | 2 |
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 |