summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorSimon Hausmann <shausman@trolltech.com>2007-06-07 07:19:34 (GMT)
committerSimon Hausmann <shausman@trolltech.com>2007-06-07 07:19:34 (GMT)
commit845b42cb6c1c1e80c4283234ea2162cae809bd50 (patch)
treee08d7b9cd271c1fbdc9f28b17769c4c021743bb1 /contrib
parent7530a40ce2006082580865f4db6d32b956ca8dc0 (diff)
downloadgit-845b42cb6c1c1e80c4283234ea2162cae809bd50.zip
git-845b42cb6c1c1e80c4283234ea2162cae809bd50.tar.gz
git-845b42cb6c1c1e80c4283234ea2162cae809bd50.tar.bz2
Fix support for "depot-path" in older git-p4 imports
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/fast-import/git-p45
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index e955ad4..e576f2d 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):