summaryrefslogtreecommitdiff
path: root/src/attr.c
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2014-04-18 15:45:59 -0700
committerRussell Belfer <rb@github.com>2014-04-18 15:45:59 -0700
commitac16bd0a94e1f7254112c7585b843bdc2d0659c1 (patch)
tree12c934742bac4f27aa7f55391cbc6d29b252e8a9 /src/attr.c
parent916fcbd61754f74b350ca689e27563cdbded2d30 (diff)
downloadlibgit2-ac16bd0a94e1f7254112c7585b843bdc2d0659c1.tar.gz
Minor fixes
Only apply LEADING_DIR pattern munging to patterns in ignore and attribute files, not to pathspecs used to select files to operate on. Also, allow internal macro definitions to be evaluated before loading all external ones (important so that external ones can make use of internal `binary` definition).
Diffstat (limited to 'src/attr.c')
-rw-r--r--src/attr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/attr.c b/src/attr.c
index 6b9a3d614..05b0c1b3c 100644
--- a/src/attr.c
+++ b/src/attr.c
@@ -294,7 +294,7 @@ int git_attr_add_macro(
git_attr_rule *macro = NULL;
git_pool *pool;
- if ((error = attr_setup(repo)) < 0)
+ if ((error = git_attr_cache__init(repo)) < 0)
return error;
macro = git__calloc(1, sizeof(git_attr_rule));