summaryrefslogtreecommitdiff
path: root/attr.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ss/exc-flag-is-a-collection-of-bits'Junio C Hamano2016-04-061-1/+1
|\
| * dir: store EXC_FLAG_* values in unsigned integersss/exc-flag-is-a-collection-of-bitsSaurav Sachidanand2016-03-011-1/+1
| * Merge branch 'pt/xdg-config-path' into maintJunio C Hamano2015-06-051-5/+2
| |\
| * \ Merge branch 'cn/bom-in-gitignore' into maintJunio C Hamano2015-05-131-2/+7
| |\ \
* | | | convert trivial cases to FLEX_ARRAY macrosJeff King2016-02-221-3/+1
* | | | convert trivial cases to ALLOC_ARRAYJeff King2016-02-221-1/+1
* | | | memoize common git-path "constant" filesjk/git-pathJeff King2015-08-101-1/+3
* | | | Merge branch 'pt/xdg-config-path'Junio C Hamano2015-05-111-5/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | attr.c: replace home_config_paths() with xdg_config_home()Paul Tan2015-05-061-5/+2
* | | | Merge branch 'cn/bom-in-gitignore'Junio C Hamano2015-05-051-2/+7
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | attr: skip UTF8 BOM at the beginning of the input filecn/bom-in-gitignoreJunio C Hamano2015-04-161-2/+7
| |/
* | attr: avoid heavy work when we know the specified attr is not definednd/attr-optimNguyễn Thái Ngọc Duy2014-12-291-5/+28
* | attr: do not attempt to expand when we know it's not a macroNguyễn Thái Ngọc Duy2014-12-291-3/+7
* | attr.c: rename arg name attr_nr to avoid shadowing the global oneNguyễn Thái Ngọc Duy2014-12-291-3/+3
|/
* use REALLOC_ARRAY for changing the allocation size of arraysrs/realloc-arrayRené Scharfe2014-09-181-2/+1
* attr.c: use ALLOC_GROW() in handle_attr_line()Dmitry S. Dolzhenko2014-03-031-6/+1
* replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-1/+1
* Merge branch 'lf/read-blob-data-from-index'Junio C Hamano2013-04-211-34/+1
|\
| * read_blob_data_from_index(): optionally return the size of blob dataLukas Fleischer2013-04-171-1/+1
| * attr.c: extract read_index_data() as read_blob_data_from_index()Lukas Fleischer2013-04-171-34/+1
| * Merge branch 'jc/directory-attrs-regression-fix' into maint-1.8.1Junio C Hamano2013-04-071-12/+13
| |\
* | \ Merge branch 'jc/directory-attrs-regression-fix'Junio C Hamano2013-04-031-12/+13
|\ \ \ | | |/ | |/|
| * | attr.c::path_matches(): special case paths that end with a slashJunio C Hamano2013-03-281-4/+4
| * | attr.c::path_matches(): the basename is part of the pathnameJunio C Hamano2013-03-261-9/+10
* | | Sync with 1.8.1.5Junio C Hamano2013-03-011-3/+5
|\ \ \ | | |/ | |/|
| * | Make !pattern in .gitattributes non-fatalThomas Rast2013-03-011-3/+5
| * | Merge branch 'nd/fix-directory-attrs-off-by-one' into maintJunio C Hamano2013-01-291-20/+18
| |\ \ | | |/
| * | Merge branch 'nd/attr-debug-fix' into maintJunio C Hamano2013-01-281-1/+1
| |\ \
* | \ \ Merge branch 'nd/fix-directory-attrs-off-by-one'Junio C Hamano2013-01-221-20/+18
|\ \ \ \ | | |_|/ | |/| |
| * | | attr: avoid calling find_basename() twice per pathDuy Nguyen2013-01-161-27/+18
| * | | attr: fix off-by-one directory component length calculationNguyễn Thái Ngọc Duy2013-01-151-0/+7
| |/ /
* | | Merge branch 'nd/attr-debug-fix'Junio C Hamano2013-01-181-1/+1
|\ \ \ | | |/ | |/|
| * | attr: make it build with DEBUG_ATTR againNguyễn Thái Ngọc Duy2013-01-151-1/+1
* | | Merge branch 'as/dir-c-cleanup'Junio C Hamano2013-01-101-1/+1
|\ \ \ | |_|/ |/| |
| * | dir.c: rename excluded() to is_excluded()Adam Spiers2012-12-281-1/+1
| |/
* | Add directory pattern matching to attributesJean-Noël AVILA2012-12-171-8/+17
* | Merge branch 'nd/attr-match-optim-more'Jeff King2012-11-091-21/+31
|\ \ | |/
| * attr: more matching optimizations from .gitignoreNguyễn Thái Ngọc Duy2012-10-151-21/+31
* | Merge branch 'nd/attr-match-optim'Jeff King2012-10-251-8/+13
|\ \ | |/
| * attr: avoid searching for basename on every matchNguyễn Thái Ngọc Duy2012-10-051-6/+9
| * attr: avoid strlen() on every matchNguyễn Thái Ngọc Duy2012-10-051-2/+4
* | Merge branch 'jk/config-warn-on-inaccessible-paths'Junio C Hamano2012-09-171-1/+1
|\ \
| * | attr: failure to open a .gitattributes file is OK with ENOTDIRJunio C Hamano2012-09-131-1/+1
* | | Merge branch 'jc/ll-merge-binary-ours'Junio C Hamano2012-09-141-1/+1
|\ \ \ | |/ / |/| |
| * | attr: "binary" attribute should choose built-in "binary" merge driverJunio C Hamano2012-09-081-1/+1
| |/
* | warn_on_inaccessible(): a helper to warn on inaccessible pathsJunio C Hamano2012-08-211-1/+1
* | attr: warn on inaccessible attribute filesJeff King2012-08-211-1/+4
* | attr: make sure we have an xdg path before using itJeff King2012-07-241-5/+7
* | Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributesHuynh Khoi Nguyen Nguyen2012-06-251-7/+10
|/
* Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-111-0/+1
|\