summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-03-14 17:32:16 +0000
committerRobert Speicher <robert@gitlab.com>2016-03-14 17:32:16 +0000
commit22b36aec8b8e0a49b4b33a11ac5f972e50cbd000 (patch)
treeebc1fc0f461157543deadfbeb5514db256ab73e3
parentbceed7365cd3be5024f3ff0dde94b189a0cd0ed0 (diff)
parent1ca8a44f0baa1728650308fe992f42660170ae16 (diff)
downloadgitlab-shell-22b36aec8b8e0a49b4b33a11ac5f972e50cbd000.tar.gz
Merge branch 'gc-no-prune' into 'master'
Do not prune objects during 'git gc' This is a workaround to reduce the impact of https://gitlab.com/gitlab-org/gitlab-ce/issues/13524 . See merge request !44
-rw-r--r--lib/gitlab_projects.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb
index 82a16fc..b3d6883 100644
--- a/lib/gitlab_projects.rb
+++ b/lib/gitlab_projects.rb
@@ -288,7 +288,7 @@ class GitlabProjects
$logger.error "gc failed: destination path <#{full_path}> does not exist."
return false
end
- cmd = %W(git --git-dir=#{full_path} gc)
+ cmd = %W(git --git-dir=#{full_path} gc --no-prune)
system(*cmd)
end
end