| commit | 34a0dbfc6b7463a68df79d5773102f85e56cbe4d | |
| author | Blair Holloway <blair_holloway@playstation.sony.com> | |
| Sat, 4 Apr 2015 08:46:03 +0000 (4 09:46 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 4 Apr 2015 19:43:20 +0000 (4 12:43 -0700) | ||
| tree | a822caf1c918d173462522a7ce36a2111c2cf454 | treesnapshot (tar.gz zip) |
| parent | d077c2db8db64c931976391afee6c35828868a11 | commitdiff |
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>
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>
| git-p4.py | diffblobblamehistory | |
| t/t9816-git-p4-locked.sh | diffblobblamehistory |