summaryrefslogtreecommitdiff
path: root/lib/gitlab_shell.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab_shell.rb')
-rw-r--r--lib/gitlab_shell.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index 57c319c..cbfe468 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -67,7 +67,7 @@ class GitlabShell
@repo_name = escape_path(args[2].sub(/\A\/~\//, ''))
# Make sure repository has git-annex enabled
- init_git_annex(@repo_name)
+ init_git_annex(@repo_name) unless gcryptsetup?(args)
when 'git-lfs-authenticate'
raise DisallowedCommandError unless args.count >= 2
@repo_name = escape_path(args[1])
@@ -174,4 +174,9 @@ class GitlabShell
$logger.info "Enable git-annex for repository: #{path}."
end
end
+
+ def gcryptsetup?(args)
+ non_dashed = args.reject { |a| a.start_with?('-') }
+ non_dashed[0, 2] == %w{git-annex-shell gcryptsetup}
+ end
end