| commit | 9cffb8c8bfd64d97769b3e3792201bcb3618dd23 | |
| author | Pete Wyckoff <pw@padd.com> | |
| Sun, 16 Oct 2011 14:45:01 +0000 (16 10:45 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Oct 2011 03:46:49 +0000 (17 20:46 -0700) | ||
| tree | 23fa5070c8d9f15d14ac0b3c269c2248be21f0dc | treesnapshot (tar.gz zip) |
| parent | 55aa5714afc1310fd94936a8cd922e868d694bd2 | commitdiff |
git-p4: recognize all p4 filetypes
The previous code was approximate in the filetypes it recognized.
Put in the canonical list and be more careful about matching
elements of the file type.
This might change behavior in some cases, hopefully for the
better. Windows newline mangling will now happen on all
text files. Previously some like "text+ko" were oddly exempt.
Files with multiple combinations of modifiers, like "text+klx",
are now recognized for keyword expansion. I expect these to be
seen only rarely.
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The previous code was approximate in the filetypes it recognized.
Put in the canonical list and be more careful about matching
elements of the file type.
This might change behavior in some cases, hopefully for the
better. Windows newline mangling will now happen on all
text files. Previously some like "text+ko" were oddly exempt.
Files with multiple combinations of modifiers, like "text+klx",
are now recognized for keyword expansion. I expect these to be
seen only rarely.
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| contrib/fast-import/git-p4 | diffblobblamehistory |