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
1
Merge Requests
1
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-ce
Commits
0db994fe
Commit
0db994fe
authored
May 30, 2018
by
Kim "BKC" Carlbäcker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix encoding error in Gitaly::Commit::TreeEntry
parent
439adb96
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
5 deletions
+13
-5
lib/gitlab/gitaly_client/commit_service.rb
lib/gitlab/gitaly_client/commit_service.rb
+1
-1
spec/lib/gitlab/git/blob_spec.rb
spec/lib/gitlab/git/blob_spec.rb
+6
-0
spec/lib/gitlab/git/commit_spec.rb
spec/lib/gitlab/git/commit_spec.rb
+2
-2
spec/lib/gitlab/git/repository_spec.rb
spec/lib/gitlab/git/repository_spec.rb
+2
-2
spec/support/gitlab-git-test.git/packed-refs
spec/support/gitlab-git-test.git/packed-refs
+1
-0
spec/support/helpers/seed_repo.rb
spec/support/helpers/seed_repo.rb
+1
-0
No files found.
lib/gitlab/gitaly_client/commit_service.rb
View file @
0db994fe
...
@@ -78,7 +78,7 @@ module Gitlab
...
@@ -78,7 +78,7 @@ module Gitlab
def
tree_entry
(
ref
,
path
,
limit
=
nil
)
def
tree_entry
(
ref
,
path
,
limit
=
nil
)
request
=
Gitaly
::
TreeEntryRequest
.
new
(
request
=
Gitaly
::
TreeEntryRequest
.
new
(
repository:
@gitaly_repo
,
repository:
@gitaly_repo
,
revision:
ref
,
revision:
encode_binary
(
ref
)
,
path:
encode_binary
(
path
),
path:
encode_binary
(
path
),
limit:
limit
.
to_i
limit:
limit
.
to_i
)
)
...
...
spec/lib/gitlab/git/blob_spec.rb
View file @
0db994fe
...
@@ -22,6 +22,12 @@ describe Gitlab::Git::Blob, seed_helper: true do
...
@@ -22,6 +22,12 @@ describe Gitlab::Git::Blob, seed_helper: true do
it
{
expect
(
blob
).
to
eq
(
nil
)
}
it
{
expect
(
blob
).
to
eq
(
nil
)
}
end
end
context
'utf-8 branch'
do
let
(
:blob
)
{
Gitlab
::
Git
::
Blob
.
find
(
repository
,
'Ääh-test-utf-8'
,
"files/ruby/popen.rb"
)}
it
{
expect
(
blob
.
id
).
to
eq
(
SeedRepo
::
RubyBlob
::
ID
)
}
end
context
'blank path'
do
context
'blank path'
do
let
(
:blob
)
{
Gitlab
::
Git
::
Blob
.
find
(
repository
,
SeedRepo
::
Commit
::
ID
,
''
)
}
let
(
:blob
)
{
Gitlab
::
Git
::
Blob
.
find
(
repository
,
SeedRepo
::
Commit
::
ID
,
''
)
}
...
...
spec/lib/gitlab/git/commit_spec.rb
View file @
0db994fe
...
@@ -603,8 +603,8 @@ describe Gitlab::Git::Commit, seed_helper: true do
...
@@ -603,8 +603,8 @@ describe Gitlab::Git::Commit, seed_helper: true do
let
(
:commit
)
{
described_class
.
find
(
repository
,
'master'
)
}
let
(
:commit
)
{
described_class
.
find
(
repository
,
'master'
)
}
subject
{
commit
.
ref_names
(
repository
)
}
subject
{
commit
.
ref_names
(
repository
)
}
it
'has
1
element'
do
it
'has
2
element'
do
expect
(
subject
.
size
).
to
eq
(
1
)
expect
(
subject
.
size
).
to
eq
(
2
)
end
end
it
{
is_expected
.
to
include
(
"master"
)
}
it
{
is_expected
.
to
include
(
"master"
)
}
it
{
is_expected
.
not_to
include
(
"feature"
)
}
it
{
is_expected
.
not_to
include
(
"feature"
)
}
...
...
spec/lib/gitlab/git/repository_spec.rb
View file @
0db994fe
...
@@ -1374,7 +1374,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
...
@@ -1374,7 +1374,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
describe
'#branch_count'
do
describe
'#branch_count'
do
it
'returns the number of branches'
do
it
'returns the number of branches'
do
expect
(
repository
.
branch_count
).
to
eq
(
1
0
)
expect
(
repository
.
branch_count
).
to
eq
(
1
1
)
end
end
context
'with local and remote branches'
do
context
'with local and remote branches'
do
...
@@ -2248,7 +2248,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
...
@@ -2248,7 +2248,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
describe
'#checksum'
do
describe
'#checksum'
do
it
'calculates the checksum for non-empty repo'
do
it
'calculates the checksum for non-empty repo'
do
expect
(
repository
.
checksum
).
to
eq
'
54f21be4c32c02f6788d72207fa03ad3bce725e4
'
expect
(
repository
.
checksum
).
to
eq
'
4be7d24ce7e8d845502d599b72d567d23e6a40c0
'
end
end
it
'returns 0000000000000000000000000000000000000000 for an empty repo'
do
it
'returns 0000000000000000000000000000000000000000 for an empty repo'
do
...
...
spec/support/gitlab-git-test.git/packed-refs
View file @
0db994fe
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
4b4918a572fa86f9771e5ba40fbd48e1eb03e2c6 refs/heads/master
4b4918a572fa86f9771e5ba40fbd48e1eb03e2c6 refs/heads/master
5937ac0a7beb003549fc5fd26fc247adbce4a52e refs/heads/merge-test
5937ac0a7beb003549fc5fd26fc247adbce4a52e refs/heads/merge-test
9596bc54a6f0c0c98248fe97077eb5ccf48a98d0 refs/heads/missing-gitmodules
9596bc54a6f0c0c98248fe97077eb5ccf48a98d0 refs/heads/missing-gitmodules
4b4918a572fa86f9771e5ba40fbd48e1eb03e2c6 refs/heads/Ääh-test-utf-8
f4e6814c3e4e7a0de82a9e7cd20c626cc963a2f8 refs/tags/v1.0.0
f4e6814c3e4e7a0de82a9e7cd20c626cc963a2f8 refs/tags/v1.0.0
^6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
^6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9
8a2a6eb295bb170b34c24c76c49ed0e9b2eaf34b refs/tags/v1.1.0
8a2a6eb295bb170b34c24c76c49ed0e9b2eaf34b refs/tags/v1.1.0
...
...
spec/support/helpers/seed_repo.rb
View file @
0db994fe
...
@@ -98,6 +98,7 @@ module SeedRepo
...
@@ -98,6 +98,7 @@ module SeedRepo
master
master
merge-test
merge-test
missing-gitmodules
missing-gitmodules
Ääh-test-utf-8
]
.
freeze
]
.
freeze
TAGS
=
%w[
TAGS
=
%w[
v1.0.0
v1.0.0
...
...
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