commit 8016f60a46845fdadbadd88c5746cdaabe476417
author David Pursehouse <dpursehouse@collab.net> Sun Aug 14 08:50:28 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Aug 14 08:50:28 2016 +0000
tree cf9940274c5c0c518a0e30ca87101f104bd8b133
parent f97e72e5ddfcd34400aba384775b793170044f5c
parent f9fe3e14d2b56140c90a8969892e06aa71127305

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

command.py

diff --git a/command.py b/command.py
index bc2f950..2ff0a34 100644
--- a/command.py
+++ b/command.py
@@ -119,6 +119,11 @@
         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]

project.py

diff --git a/project.py b/project.py
index c91085c..918ee09 100644
--- a/project.py
+++ b/project.py
@@ -628,7 +628,7 @@
     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