Merge branch 'no-init-on-gcryptsetup' into 'master'

Skip 'git annex init' when using 'gcryptsetup'

'gcryptsetup' is a special git-annex feature that does its own
initialization.

See merge request !18

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index cae501a..4bc1cd7 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])
@@ -177,4 +177,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