Merge "repo: Repo does not always handle '.' parameter correctly"
This commit is contained in:
commit
8016f60a46
2 changed files with 6 additions and 1 deletions
|
@ -119,6 +119,11 @@ class Command(object):
|
|||
except KeyError:
|
||||
oldpath = path
|
||||
path = os.path.dirname(path)
|
||||
if not project and path == manifest.topdir:
|
||||
try:
|
||||
project = self._by_path[path]
|
||||
except KeyError:
|
||||
pass
|
||||
else:
|
||||
try:
|
||||
project = self._by_path[path]
|
||||
|
|
|
@ -628,7 +628,7 @@ class Project(object):
|
|||
self.gitdir = gitdir.replace('\\', '/')
|
||||
self.objdir = objdir.replace('\\', '/')
|
||||
if worktree:
|
||||
self.worktree = worktree.replace('\\', '/')
|
||||
self.worktree = os.path.normpath(worktree.replace('\\', '/'))
|
||||
else:
|
||||
self.worktree = None
|
||||
self.relpath = relpath
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue