summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-02-17 06:44:55 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-02-17 06:44:55 +0000
commit9502fa067bf5725e9fbf3363d8d3488002f2eb41 (patch)
tree0e9de1653ec601da8cc2b406bb0944aaa3e4d635
parentf888c13004c5258eb0080e9ae089c2ae779d9d2a (diff)
parent603cc6a15dc00e37915cf7fad5f07a076be90cda (diff)
downloadgitlab-shell-9502fa067bf5725e9fbf3363d8d3488002f2eb41.tar.gz
Merge branch 'git-annex-fix' into 'master'
Git annex fix See merge request !58
-rw-r--r--lib/gitlab_shell.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index c01c9bf..d053ffb 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -130,9 +130,9 @@ class GitlabShell
def init_git_annex(path)
full_repo_path = File.join(repos_path, path)
- unless File.exists?(File.join(full_repo_path, '.git', 'annex'))
+ unless File.exists?(File.join(full_repo_path, 'annex'))
cmd = %W(git --git-dir=#{full_repo_path} annex init "GitLab")
- system(*cmd)
+ system(*cmd, err: '/dev/null', out: '/dev/null')
$logger.info "Enable git-annex for repository: #{path}."
end
end