From: Simon Hausmann <shausman@trolltech.com>
Date: Mon, 21 May 2007 07:34:56 +0000 (+0200)
Subject: Fix error detection with git-p4 submit when the requested depot path is not in the... 
X-Git-Tag: v1.5.3-rc0~65^2^2~81
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=dc5240369610a6f72eab9b59447889dfd69b31c5;p=git.git

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>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 7489c9108..73da5d2b2 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")