diff options
| author | Simon Hausmann <shausman@trolltech.com> | 2007-06-07 09:19:34 +0200 |
|---|---|---|
| committer | Simon Hausmann <shausman@trolltech.com> | 2007-06-07 09:19:34 +0200 |
| commit | 845b42cb6c1c1e80c4283234ea2162cae809bd50 (patch) | |
| tree | e08d7b9cd271c1fbdc9f28b17769c4c021743bb1 /contrib | |
| parent | 7530a40ce2006082580865f4db6d32b956ca8dc0 (diff) | |
| download | git-845b42cb6c1c1e80c4283234ea2162cae809bd50.tar.gz git-845b42cb6c1c1e80c4283234ea2162cae809bd50.tar.xz | |
Fix support for "depot-path" in older git-p4 imports
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 5 |
1 files changed, 4 insertions, 1 deletions
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): |