php-src/.gitattributes

# Replace $Id$ strings with 40-character hexadecimal blob object name.
/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

# Configure proper diff drivers to improve the context lines in the output
# of git diff and to improve token splitting for --word-diff.
*.phpt diff=php
*.php diff=php
*.[ch] diff=cpp

# Collapse the generated arginfo.h files within a pull request.
**/*_arginfo.h linguist-generated
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 14:43:50 +08:00			`# Replace $Id$ strings with 40-character hexadecimal blob object name.`
			`/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`

Configure diff drivers for `php`, `phpt`, `c` and `h` in `.gitattributes` (#8343) 2022-04-13 03:08:02 +08:00			`# Configure proper diff drivers to improve the context lines in the output`
			`# of git diff and to improve token splitting for --word-diff.`
			`*.phpt diff=php`
			`*.php diff=php`
			`*.[ch] diff=cpp`
[skip ci] Mark `_arginfo.h` as `linguist-generated` (#8722) The generated `_arginfo.h` usually cannot be usefully reviewed within a PR. Collapse them by default by adding the `linguist-generated` attribute to reduce the visual noise. see https://docs.github.com/en/repositories/working-with-files/managing-files/customizing-how-changed-files-appear-on-github see https://github.com/github/linguist/blob/master/docs/overrides.md#summary 2022-06-07 19:35:09 +08:00
			`# Collapse the generated arginfo.h files within a pull request.`
			`*/_arginfo.h linguist-generated`