summaryrefslogtreecommitdiff
path: root/attr.c
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * attr: fix leak in free_attr_elemJeff King2012-01-111-0/+1
* | Merge the attributes fix in from maint-1.6.6 branchJunio C Hamano2012-01-101-32/+43
|\ \ | |/
| * attr.c: clarify the logic to pop attr_stackJunio C Hamano2012-01-101-1/+10
| * attr.c: make bootstrap_attr_stack() leave earlyJunio C Hamano2012-01-101-30/+31
| * attr: drop misguided defensive codingJeff King2012-01-101-1/+1
| * attr: don't confuse prefixes with leading directoriesJeff King2012-01-101-1/+2
* | attr.c: respect core.ignorecase when matching attribute patternsBrandon Casey2011-10-111-2/+3
* | attr: read core.attributesfile from git_default_core_configJunio C Hamano2011-10-061-13/+2
* | cleanup: use internal memory allocation wrapper functions everywhereBrandon Casey2011-10-061-1/+1
* | attr.c: avoid inappropriate access to strbuf "buf" memberBrandon Casey2011-10-061-13/+11
* | Merge branch 'mh/attr'Junio C Hamano2011-08-281-50/+63
|\ \
| * | Unroll the loop over passesMichael Haggerty2011-08-141-25/+26
| * | Change while loop into for loopMichael Haggerty2011-08-141-4/+1
| * | Determine the start of the states outside of the pass loopMichael Haggerty2011-08-141-3/+5
| * | Change parse_attr() to take a pointer to struct attr_stateMichael Haggerty2011-08-141-6/+11
| * | Increment num_attr in parse_attr_line(), not parse_attr()Michael Haggerty2011-08-141-4/+4
| * | Document struct match_attrMichael Haggerty2011-08-141-0/+14
View Lorry Controller Status