diff options
| author | Blair Holloway <blair_holloway@playstation.sony.com> | 2015-04-04 09:46:03 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-04-04 12:43:20 -0700 |
| commit | 34a0dbfc6b7463a68df79d5773102f85e56cbe4d (patch) | |
| tree | a822caf1c918d173462522a7ce36a2111c2cf454 /mergesort.c | |
| parent | d077c2db8db64c931976391afee6c35828868a11 (diff) | |
| download | git-34a0dbfc6b7463a68df79d5773102f85e56cbe4d.tar.gz | |
git-p4: fix filetype detection on files opened exclusivelyld/p4-filetype-detection
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 'mergesort.c')
0 files changed, 0 insertions, 0 deletions