diff options
| author | Russell Belfer <arrbee@arrbee.com> | 2012-01-16 15:16:44 -0800 |
|---|---|---|
| committer | Russell Belfer <arrbee@arrbee.com> | 2012-01-16 15:16:44 -0800 |
| commit | cfbc880d8a407bcd2074dda4221d337daf72195c (patch) | |
| tree | eb1cd2d1be66c2b5604fbe3699b38aae984851b3 /src/attr.c | |
| parent | 1dbcc9fc4e6f5264d5bb46f6d7f744eb4a4063e4 (diff) | |
| download | libgit2-cfbc880d8a407bcd2074dda4221d337daf72195c.tar.gz | |
Patch cleanup for merge
After reviewing the gitignore support with Vicent, we came up
with a list of minor cleanups to prepare for merge, including:
* checking git_repository_config error returns
* renaming git_ignore_is_ignored and moving to status.h
* fixing next_line skipping to include \r skips
* commenting on where ignores are and are not included
Diffstat (limited to 'src/attr.c')
| -rw-r--r-- | src/attr.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/attr.c b/src/attr.c index cbc2a5bf5..dc42379ff 100644 --- a/src/attr.c +++ b/src/attr.c @@ -3,11 +3,6 @@ #include "config.h" #include <ctype.h> -#define GIT_ATTR_FILE_INREPO "info/attributes" -#define GIT_ATTR_FILE ".gitattributes" -#define GIT_ATTR_FILE_SYSTEM "gitattributes" -#define GIT_ATTR_CONFIG "core.attributesfile" - static int collect_attr_files( git_repository *repo, const char *path, git_vector *files); @@ -304,7 +299,7 @@ static int collect_attr_files( if (error < GIT_SUCCESS) goto cleanup; - if (git_repository_config(&cfg, repo) == GIT_SUCCESS) { + if ((error = git_repository_config(&cfg, repo)) == GIT_SUCCESS) { const char *core_attribs = NULL; git_config_get_string(cfg, GIT_ATTR_CONFIG, &core_attribs); git_clearerror(); /* don't care if attributesfile is not set */ |