diff options
author | Blair Holloway <blair_holloway@playstation.sony.com> | 2015-04-04 10:46:03 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-04-04 21:43:20 +0200 |
commit | 34a0dbfc6b7463a68df79d5773102f85e56cbe4d (patch) | |
tree | a822caf1c918d173462522a7ce36a2111c2cf454 /git-p4.py | |
parent | git-p4: small fix for locked-file-move-test (diff) | |
download | git-34a0dbfc6b7463a68df79d5773102f85e56cbe4d.tar.xz git-34a0dbfc6b7463a68df79d5773102f85e56cbe4d.zip |
git-p4: fix filetype detection on files opened exclusively
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 <blair_holloway@playstation.sony.com>
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-x | git-p4.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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: |