clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
7686b0b889
php-src/.gitattributes

21 lines
796 B
Plaintext
Raw Normal View History

Fix .gitattributes The `crlf` Git attribute has been long deprecated and made obsolete. A replacement for using `-crlf` is `-text`. That way Git doesn't do newlines normalization on any system. Since the phpt files don't need specific line endings in any files except for some special CR characters in some, this can be also removed and line normalization can happen on all phpt files. The run-tests.php file converts the CRLF to LF before running the test. This patch also sets a `diff` attributes for all *.phpt files. It helps showing diffs for some phpt files with special characters such as ASCII control characters which makes Git recognize them as binary and stops showing commit diffs otherwise Some additional short info about used Git attributes has been also added as comments for easier understanding. Remove -text gitattribute
2018-10-06 06:43:50 +00:00
# Replace $Id$ strings with 40-character hexadecimal blob object name.
/ext/mysqlnd/mysqlnd.h ident
/ext/ext_skel.php ident
/ext/phar/phar/pharcommand.inc ident
/ext/dba/libinifile/inifile.c ident
/ext/dba/libflatfile/flatfile.c ident
/ext/dba/libcdb/cdb_make.c ident
/ext/dba/libcdb/cdb.c ident
/run-tests.php ident
# A custom merge driver to avoid automatic merges. These are manually merged.
# See https://wiki.php.net/vcs/gitfaq
/NEWS merge=NEWS
/UPGRADING merge=NEWS
/UPGRADING.INTERNALS merge=NEWS
# Enable commit diffs for binary PHP test files. Some PHP test files include
# special characters, such as ASCII control characters. Git recognizes these as
# binary and wouldn't generate diffs.
*.phpt diff
Reference in New Issue Copy Permalink