diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-01 09:50:40 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-01 09:50:40 +0000 |
| commit | 6add33352316af566cec5d827981f1783c59b7f4 (patch) | |
| tree | e4d4da632a7cb75497982abe52745d2eb1738b61 /spec/gitlab_shell_spec.rb | |
| parent | 57bc57298c64f40a0a851e474b3e6de91a551ec5 (diff) | |
| parent | ac814447cbf1da9f65299a96fb787fc6bb3ce2e6 (diff) | |
| download | gitlab-shell-6add33352316af566cec5d827981f1783c59b7f4.tar.gz | |
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
Diffstat (limited to 'spec/gitlab_shell_spec.rb')
| -rw-r--r-- | spec/gitlab_shell_spec.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/gitlab_shell_spec.rb b/spec/gitlab_shell_spec.rb index 77523d7..62e0d36 100644 --- a/spec/gitlab_shell_spec.rb +++ b/spec/gitlab_shell_spec.rb @@ -96,6 +96,14 @@ describe GitlabShell do it 'should init git-annex' do File.exists?(File.join(tmp_repos_path, 'dzaporozhets/gitlab.git/annex')).should be_true end + + context 'with git-annex-shell gcryptsetup' do + let(:ssh_cmd) { 'git-annex-shell gcryptsetup /~/dzaporozhets/gitlab.git' } + + it 'should not init git-annex' do + File.exists?(File.join(tmp_repos_path, 'dzaporozhets/gitlab.git/annex')).should be_false + end + end end end |