From: Luke Diamand Date: Fri, 03 Apr 2015 18:53:37 GMT Subject: [PATCHv2 3/4] git-p4: fix filetype detection on files opened exclusively Message-ID: <1428087218-8186-4-git-send-email-luke@diamand.org> In-Reply-To: <1428087218-8186-1-git-send-email-luke@diamand.org> From: "Holloway, Blair" If a Perforce server is configured to automatically set +l (exclusive lock) on add of certain file types, git p4 submit will fail during getP4OpenedType, as the regex doesn't expect the trailing '*exclusive*' from p4 opened: //depot/file.png#1 - add default change (binary+l) *exclusive* Signed-off-by: Blair Holloway Acked-by: Luke Diamand --- git-p4.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-p4.py b/git-p4.py index ff132b2..d43482a 100755 --- a/git-p4.py +++ b/git-p4.py @@ -368,7 +368,7 @@ def getP4OpenedType(file): # Returns the perforce file type for the given file. result = p4_read_pipe(["opened", wildcard_encode(file)]) - match = re.match(".*\((.+)\)\r?$", result) + match = re.match(".*\((.+)\)( \*exclusive\*)?\r?$", result) if match: return match.group(1) else: -- 2.3.0.rc1.30.g76afe74