engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

git: fixed readme searcher for libgit2

Browse source
This commit is contained in:
Marcin Kuzminski 2020-05-14 09:40:41 +02:00
parent 0127fbe62e
commit 4b277c70fe
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rhodecode/lib/vcs/backends/git/commit.py
View file

@ -307,15 +307,16 @@ class GitCommit(base.BaseCommit):
filenodes = []
# extracted tree ID gives us our files...
bytes_path = safe_str(path) # libgit operates on bytes
for name, stat_, id_, type_ in self._remote.tree_items(tree_id):
if type_ == 'link':
url = self._get_submodule_url('/'.join((path, name)))
url = self._get_submodule_url('/'.join((bytes_path, name)))
dirnodes.append(SubModuleNode(
name, url=url, commit=id_, alias=self.repository.alias))
continue
if path != '':
obj_path = '/'.join((path, name))
if bytes_path != '':
obj_path = '/'.join((bytes_path, name))
else:
obj_path = name
if obj_path not in self._stat_modes:

2
rhodecode/model/repo.py
View file

@ -1098,7 +1098,7 @@ class ReadmeFinder:
self._renderer_extensions = self.RENDERER_TO_EXTENSION.get(
default_renderer, [])
def search(self, commit, path='/'):
def search(self, commit, path=u'/'):
"""
Find a readme in the given `commit`.
"""