From: Simon Hausmann <shausman@trolltech.com>
Date: Thu, 7 Jun 2007 07:19:34 +0000 (+0200)
Subject: Fix support for "depot-path" in older git-p4 imports
X-Git-Tag: v1.5.3-rc0~65^2^2~20^2~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=845b42cb6c1c1e80c4283234ea2162cae809bd50;p=git.git

Fix support for "depot-path" in older git-p4 imports

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index e955ad4f4..e576f2dd9 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -153,7 +153,10 @@ def extractSettingsGitLog(log):
 
             values[key] = val
 
-    values['depot-paths'] = values.get("depot-paths").split(',')
+    paths = values.get("depot-paths")
+    if not paths:
+        paths = values.get("depot-path")
+    values['depot-paths'] = paths.split(',')
     return values
 
 def gitBranchExists(branch):