Fix project name guessing
authorSimon Hausmann <simon@lst.de>
Mon, 11 Jun 2007 06:50:57 +0000 (08:50 +0200)
committerSimon Hausmann <simon@lst.de>
Mon, 11 Jun 2007 06:50:57 +0000 (08:50 +0200)
git-p4

diff --git a/git-p4 b/git-p4
index 9d52eada425424f1dedcd8704128067fcc5412dc..551573afc59245631668d923d98c75acad0124e1 100755 (executable)
--- a/git-p4
+++ b/git-p4
@@ -909,7 +909,12 @@ class P4Sync(Command):
 
     def guessProjectName(self):
         for p in self.depotPaths:
-            return p [p.strip().rfind("/") + 1:]
+            if p.endswith("/"):
+                p = p[:-1]
+            p = p[p.strip().rfind("/") + 1:]
+            if not p.endswith("/"):
+               p += "/"
+            return p
 
     def getBranchMapping(self):
         for info in p4CmdList("branches"):