diff options
author | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2018-03-08 16:27:31 +0100 |
---|---|---|
committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2018-03-08 16:27:31 +0100 |
commit | 3ddde75a1b0d1beca4e2294b567ec3c227ace6f5 (patch) | |
tree | 73a6f51ec584a6da6361e57888c6fa1c648fc0df /lib | |
parent | 7734e85bc6592c5ad3330c611c5f83a051b680b0 (diff) | |
download | gitlab-ce-3ddde75a1b0d1beca4e2294b567ec3c227ace6f5.tar.gz |
Make 'git fsck' mandatorygitaly-fsck-mandatory
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/git/repository.rb | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index d4f6b543daf..5fc591b4fd2 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -1189,15 +1189,9 @@ module Gitlab end def fsck - gitaly_migrate(:git_fsck) do |is_enabled| - msg, status = if is_enabled - gitaly_fsck - else - shell_fsck - end + msg, status = gitaly_repository_client.fsck - raise GitError.new("Could not fsck repository: #{msg}") unless status.zero? - end + raise GitError.new("Could not fsck repository: #{msg}") unless status.zero? end def create_from_bundle(bundle_path) @@ -1606,14 +1600,6 @@ module Gitlab File.write(File.join(worktree_info_path, 'sparse-checkout'), files) end - def gitaly_fsck - gitaly_repository_client.fsck - end - - def shell_fsck - run_git(%W[--git-dir=#{path} fsck], nice: true) - end - def rugged_fetch_source_branch(source_repository, source_branch, local_ref) with_repo_branch_commit(source_repository, source_branch) do |commit| if commit |