Commit 1ea6b05e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets Committed by Marin Jankovski

Merge branch 'rake_backup' into 'master'

Backup repo with tar instead of git bundle

Fixes gitlab/gitlab-ee#246

See merge request !1723
parent 1667861e
...@@ -77,6 +77,7 @@ v 7.9.0 (unreleased) ...@@ -77,6 +77,7 @@ v 7.9.0 (unreleased)
- Ability to unsubscribe/subscribe to issue or merge request - Ability to unsubscribe/subscribe to issue or merge request
- Delete deploy key when last connection to a project is destroyed. - Delete deploy key when last connection to a project is destroyed.
- Fix invalid Atom feeds when using emoji, horizontal rules, or images (Christian Walther) - Fix invalid Atom feeds when using emoji, horizontal rules, or images (Christian Walther)
- Backup of repositories with tar instead of git bundle (only now are git-annex files included in the backup)
v 7.8.4 v 7.8.4
- Fix issue_tracker_id substitution in custom issue trackers - Fix issue_tracker_id substitution in custom issue trackers
......
...@@ -16,7 +16,7 @@ module Backup ...@@ -16,7 +16,7 @@ module Backup
if project.empty_repo? if project.empty_repo?
$progress.puts "[SKIPPED]".cyan $progress.puts "[SKIPPED]".cyan
else else
cmd = %W(git --git-dir=#{path_to_repo(project)} bundle create #{path_to_bundle(project)} --all) cmd = %W(tar -cf #{path_to_bundle(project)} -C #{path_to_repo(project)} .)
output, status = Gitlab::Popen.popen(cmd) output, status = Gitlab::Popen.popen(cmd)
if status.zero? if status.zero?
$progress.puts "[DONE]".green $progress.puts "[DONE]".green
...@@ -64,7 +64,8 @@ module Backup ...@@ -64,7 +64,8 @@ module Backup
project.namespace.ensure_dir_exist if project.namespace project.namespace.ensure_dir_exist if project.namespace
if File.exists?(path_to_bundle(project)) if File.exists?(path_to_bundle(project))
cmd = %W(git clone --bare #{path_to_bundle(project)} #{path_to_repo(project)}) FileUtils.mkdir_p(path_to_repo(project))
cmd = %W(tar -xf #{path_to_bundle(project)} -C #{path_to_repo(project)})
else else
cmd = %W(git init --bare #{path_to_repo(project)}) cmd = %W(git init --bare #{path_to_repo(project)})
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment