summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Simon Hausmann <shausman@trolltech.com>2007-05-21 09:34:56 +0200
committerLibravatar Simon Hausmann <shausman@trolltech.com>2007-05-21 09:34:56 +0200
commitdc5240369610a6f72eab9b59447889dfd69b31c5 (patch)
tree025cbbc6a142654bbee5c762216308a357dcdc03 /contrib
parentFix conversion from old style heads/p4 to remotes/p4/master (diff)
downloadtgif-dc5240369610a6f72eab9b59447889dfd69b31c5.tar.xz
Fix error detection with git-p4 submit when the requested depot path is not in the client view.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/fast-import/git-p42
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 7489c91081..73da5d2b27 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -55,6 +55,8 @@ def p4Where(depotPath):
if not depotPath.endswith("/"):
depotPath += "/"
output = p4Cmd("where %s..." % depotPath)
+ if output["code"] == "error":
+ return ""
clientPath = ""
if "path" in output:
clientPath = output.get("path")