Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-shell
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-shell
Commits
8ec96837
Commit
8ec96837
authored
Mar 16, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
get git annex to work when using custom SSH port
parent
22b36aec
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
lib/gitlab_shell.rb
lib/gitlab_shell.rb
+2
-3
spec/gitlab_shell_spec.rb
spec/gitlab_shell_spec.rb
+9
-1
No files found.
lib/gitlab_shell.rb
View file @
8ec96837
...
@@ -101,9 +101,8 @@ class GitlabShell
...
@@ -101,9 +101,8 @@ class GitlabShell
parsed_args
=
parsed_args
=
args
.
map
do
|
arg
|
args
.
map
do
|
arg
|
# Convert /~/group/project.git to group/project.git
# use full repo path
# to make git annex path compatible with gitlab-shell
if
arg
=~
/\A\/.*\.git\Z/
if
arg
=~
/\A\/~\/.*\.git\Z/
repo_full_path
repo_full_path
else
else
arg
arg
...
...
spec/gitlab_shell_spec.rb
View file @
8ec96837
...
@@ -104,6 +104,14 @@ describe GitlabShell do
...
@@ -104,6 +104,14 @@ describe GitlabShell do
File
.
exists?
(
File
.
join
(
tmp_repos_path
,
'dzaporozhets/gitlab.git/annex'
)).
should
be_false
File
.
exists?
(
File
.
join
(
tmp_repos_path
,
'dzaporozhets/gitlab.git/annex'
)).
should
be_false
end
end
end
end
context
'git annex SSH custom port issue'
do
let
(
:ssh_args
)
{
%W(git-annex-shell inannex /dzaporozhets/gitlab.git SHA256E)
}
it
'should init git-annex'
do
File
.
exists?
(
File
.
join
(
tmp_repos_path
,
'dzaporozhets/gitlab.git/annex'
)).
should
be_true
end
end
end
end
end
end
...
@@ -171,7 +179,7 @@ describe GitlabShell do
...
@@ -171,7 +179,7 @@ describe GitlabShell do
end
end
end
end
context
'no command'
do
context
'no command'
do
after
{
subject
.
exec
(
nil
)
}
after
{
subject
.
exec
(
nil
)
}
it
"should call api.discover"
do
it
"should call api.discover"
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment