Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
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
Léo-Paul Géneau
gitlab-ce
Commits
08554787
Commit
08554787
authored
Jun 25, 2018
by
Zeger-Jan van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Write Config is mandatory
Closes
https://gitlab.com/gitlab-org/gitaly/issues/879
parent
901159bb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
40 deletions
+24
-40
lib/gitlab/git/repository.rb
lib/gitlab/git/repository.rb
+3
-9
spec/lib/gitlab/git/repository_spec.rb
spec/lib/gitlab/git/repository_spec.rb
+21
-31
No files found.
lib/gitlab/git/repository.rb
View file @
08554787
...
@@ -1268,16 +1268,10 @@ module Gitlab
...
@@ -1268,16 +1268,10 @@ module Gitlab
return
unless
full_path
.
present?
return
unless
full_path
.
present?
# This guard avoids Gitaly log/error spam
# This guard avoids Gitaly log/error spam
unless
exists?
raise
NoRepository
,
'repository does not exist'
unless
exists?
raise
NoRepository
,
'repository does not exist'
end
gitaly_migrate
(
:write_config
)
do
|
is_enabled
|
wrapped_gitaly_errors
do
if
is_enabled
gitaly_repository_client
.
write_config
(
full_path:
full_path
)
gitaly_repository_client
.
write_config
(
full_path:
full_path
)
else
rugged_write_config
(
full_path:
full_path
)
end
end
end
end
end
...
...
spec/lib/gitlab/git/repository_spec.rb
View file @
08554787
...
@@ -1871,7 +1871,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
...
@@ -1871,7 +1871,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
repository_rugged
.
config
[
"gitlab.fullpath"
]
=
repository_path
repository_rugged
.
config
[
"gitlab.fullpath"
]
=
repository_path
end
end
shared_examples
'writing repo config'
do
context
'is given a path'
do
context
'is given a path'
do
it
'writes it to disk'
do
it
'writes it to disk'
do
repository
.
write_config
(
full_path:
"not-the/real-path.git"
)
repository
.
write_config
(
full_path:
"not-the/real-path.git"
)
...
@@ -1907,15 +1906,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
...
@@ -1907,15 +1906,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
end
end
end
end
context
"when gitaly_write_config is enabled"
do
it_behaves_like
"writing repo config"
end
context
"when gitaly_write_config is disabled"
,
:disable_gitaly
do
it_behaves_like
"writing repo config"
end
end
describe
'#merge'
do
describe
'#merge'
do
let
(
:repository
)
do
let
(
:repository
)
do
Gitlab
::
Git
::
Repository
.
new
(
'default'
,
TEST_MUTABLE_REPO_PATH
,
''
)
Gitlab
::
Git
::
Repository
.
new
(
'default'
,
TEST_MUTABLE_REPO_PATH
,
''
)
...
...
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