From: Simon Hausmann <shausman@trolltech.com>
Date: Thu, 7 Jun 2007 11:10:20 +0000 (+0200)
Subject: Fix depot-path determination for git-p4 submit
X-Git-Tag: v1.5.3-rc0~65^2^2~20^2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a52d5c7bc027248fca472a402882586a9eaf59bf;p=git.git

Fix depot-path determination for git-p4 submit

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

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 8be0afe82..8b00e350e 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -494,7 +494,7 @@ class P4Submit(Command):
             settings = extractSettingsGitLog(extractLogMessageFromGitCommit("p4"))
         if len(depotPath) == 0 and gitBranchExists("origin"):
             settings = extractSettingsGitLog(extractLogMessageFromGitCommit("origin"))
-        depotPaths = settings['depot-paths']
+        depotPath = settings['depot-paths'][0]
 
         if len(depotPath) == 0:
             print "Internal error: cannot locate perforce depot path from existing branches"