Merge branch 'pt/credential-xdg'

diff --git a/git-p4.py b/git-p4.py
index 549022e97c83e4a2f1898dc005331e5bca3f0ded..2e1c4af1910d6c246aa7a73e76d0026f67580cc1 100755 (executable)
--- 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: