android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-23 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "repo: Repo does not always handle '.' parameter correctly"

Browse Source
This commit is contained in:
David Pursehouse 2016-08-14 08:50:28 +00:00 committed by Gerrit Code Review
commit 8016f60a46
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
command.py
View File

@ -119,6 +119,11 @@ class Command(object):
except KeyError: except KeyError:
oldpath = path oldpath = path
path = os.path.dirname(path) path = os.path.dirname(path)
if not project and path == manifest.topdir:
try:
project = self._by_path[path]
except KeyError:
pass
else: else:
try: try:
project = self._by_path[path] project = self._by_path[path]

2
project.py
View File

@ -628,7 +628,7 @@ class Project(object):
self.gitdir = gitdir.replace('\\', '/') self.gitdir = gitdir.replace('\\', '/')
self.objdir = objdir.replace('\\', '/') self.objdir = objdir.replace('\\', '/')
if worktree: if worktree:
self.worktree = worktree.replace('\\', '/') self.worktree = os.path.normpath(worktree.replace('\\', '/'))
else: else:
self.worktree = None self.worktree = None
self.relpath = relpath self.relpath = relpath