diff options
author | Philip Kelley <phkelley@hotmail.com> | 2012-09-17 15:42:41 -0400 |
---|---|---|
committer | Philip Kelley <phkelley@hotmail.com> | 2012-09-17 15:42:41 -0400 |
commit | ec40b7f99f7f7161b0a1b24f1d8a934ec0eaacb1 (patch) | |
tree | 59744c10038258c3993a4eb1b1dfc3896c35b97a /src/ignore.c | |
parent | e8776d30f7edb570f435cf746d712c696b862bdd (diff) | |
download | libgit2-ec40b7f99f7f7161b0a1b24f1d8a934ec0eaacb1.tar.gz |
Support for core.ignorecase
Diffstat (limited to 'src/ignore.c')
-rw-r--r-- | src/ignore.c | 53 |
1 files changed, 43 insertions, 10 deletions
diff --git a/src/ignore.c b/src/ignore.c index 3c2f19ab9..c562f4e43 100644 --- a/src/ignore.c +++ b/src/ignore.c @@ -1,20 +1,37 @@ #include "git2/ignore.h" #include "ignore.h" #include "path.h" +#include "config.h" #define GIT_IGNORE_INTERNAL "[internal]exclude" #define GIT_IGNORE_FILE_INREPO "info/exclude" #define GIT_IGNORE_FILE ".gitignore" static int parse_ignore_file( - git_repository *repo, const char *buffer, git_attr_file *ignores) + git_repository *repo, void *parsedata, const char *buffer, git_attr_file *ignores) { int error = 0; git_attr_fnmatch *match = NULL; const char *scan = NULL; char *context = NULL; - - GIT_UNUSED(repo); + bool ignore_case = false; + git_config *cfg = NULL; + int val; + + /* Prefer to have the caller pass in a git_ignores as the parsedata object. + * If they did not, then we can (much more slowly) find the value of + * ignore_case by using the repository object. */ + if (parsedata != NULL) { + ignore_case = ((git_ignores *)parsedata)->ignore_case; + } else { + if ((error = git_repository_config(&cfg, repo)) < 0) + return error; + + if (git_config_get_bool(&val, cfg, "core.ignorecase") == 0) + ignore_case = (val != 0); + + git_config_free(cfg); + } if (ignores->key && git__suffixcmp(ignores->key, "/" GIT_IGNORE_FILE) == 0) { context = ignores->key + 2; @@ -31,6 +48,9 @@ static int parse_ignore_file( match->flags = GIT_ATTR_FNMATCH_ALLOWSPACE; + if (ignore_case) + match->flags |= GIT_ATTR_FNMATCH_ICASE; + if (!(error = git_attr_fnmatch__parse( match, ignores->pool, context, &scan))) { @@ -58,13 +78,13 @@ static int parse_ignore_file( return error; } -#define push_ignore_file(R,S,B,F) \ - git_attr_cache__push_file((R),(B),(F),GIT_ATTR_FILE_FROM_FILE,parse_ignore_file,(S)) +#define push_ignore_file(R,IGN,S,B,F) \ + git_attr_cache__push_file((R),(B),(F),GIT_ATTR_FILE_FROM_FILE,parse_ignore_file,(IGN),(S)) static int push_one_ignore(void *ref, git_buf *path) { git_ignores *ign = (git_ignores *)ref; - return push_ignore_file(ign->repo, &ign->ign_path, path->ptr, GIT_IGNORE_FILE); + return push_ignore_file(ign->repo, ign, &ign->ign_path, path->ptr, GIT_IGNORE_FILE); } int git_ignore__for_path( @@ -74,6 +94,8 @@ int git_ignore__for_path( { int error = 0; const char *workdir = git_repository_workdir(repo); + git_config *cfg = NULL; + int val; assert(ignores); @@ -81,6 +103,17 @@ int git_ignore__for_path( git_buf_init(&ignores->dir, 0); ignores->ign_internal = NULL; + /* Set the ignore_case flag appropriately */ + if ((error = git_repository_config(&cfg, repo)) < 0) + goto cleanup; + + if (git_config_get_bool(&val, cfg, "core.ignorecase") == 0) + ignores->ignore_case = (val != 0); + else + ignores->ignore_case = 0; + + git_config_free(cfg); + if ((error = git_vector_init(&ignores->ign_path, 8, NULL)) < 0 || (error = git_vector_init(&ignores->ign_global, 2, NULL)) < 0 || (error = git_attr_cache__init(repo)) < 0) @@ -109,14 +142,14 @@ int git_ignore__for_path( } /* load .git/info/exclude */ - error = push_ignore_file(repo, &ignores->ign_global, + error = push_ignore_file(repo, ignores, &ignores->ign_global, git_repository_path(repo), GIT_IGNORE_FILE_INREPO); if (error < 0) goto cleanup; /* load core.excludesfile */ if (git_repository_attr_cache(repo)->cfg_excl_file != NULL) - error = push_ignore_file(repo, &ignores->ign_global, NULL, + error = push_ignore_file(repo, ignores, &ignores->ign_global, NULL, git_repository_attr_cache(repo)->cfg_excl_file); cleanup: @@ -132,7 +165,7 @@ int git_ignore__push_dir(git_ignores *ign, const char *dir) return -1; else return push_ignore_file( - ign->repo, &ign->ign_path, ign->dir.ptr, GIT_IGNORE_FILE); + ign->repo, ign, &ign->ign_path, ign->dir.ptr, GIT_IGNORE_FILE); } int git_ignore__pop_dir(git_ignores *ign) @@ -223,7 +256,7 @@ int git_ignore_add_rule( git_attr_file *ign_internal; if (!(error = get_internal_ignores(&ign_internal, repo))) - error = parse_ignore_file(repo, rules, ign_internal); + error = parse_ignore_file(repo, NULL, rules, ign_internal); return error; } |