diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/attr.c | 6 | ||||
| -rw-r--r-- | src/attr_file.c | 1 | ||||
| -rw-r--r-- | src/attr_file.h | 1 | ||||
| -rw-r--r-- | src/ignore.c | 4 |
4 files changed, 5 insertions, 7 deletions
diff --git a/src/attr.c b/src/attr.c index 14eab5b46..92ff6c7a5 100644 --- a/src/attr.c +++ b/src/attr.c @@ -68,7 +68,7 @@ int git_attr_get_ext( if (git_repository_is_bare(repo)) dir_flag = GIT_DIR_FLAG_FALSE; - if (git_attr_path__init(&path, repo, pathname, git_repository_workdir(repo), dir_flag) < 0) + if (git_attr_path__init(&path, pathname, git_repository_workdir(repo), dir_flag) < 0) return -1; if ((error = collect_attr_files(repo, NULL, opts, pathname, &files)) < 0) @@ -149,7 +149,7 @@ int git_attr_get_many_with_session( if (git_repository_is_bare(repo)) dir_flag = GIT_DIR_FLAG_FALSE; - if (git_attr_path__init(&path, repo, pathname, git_repository_workdir(repo), dir_flag) < 0) + if (git_attr_path__init(&path, pathname, git_repository_workdir(repo), dir_flag) < 0) return -1; if ((error = collect_attr_files(repo, attr_session, opts, pathname, &files)) < 0) @@ -264,7 +264,7 @@ int git_attr_foreach_ext( if (git_repository_is_bare(repo)) dir_flag = GIT_DIR_FLAG_FALSE; - if (git_attr_path__init(&path, repo, pathname, git_repository_workdir(repo), dir_flag) < 0) + if (git_attr_path__init(&path, pathname, git_repository_workdir(repo), dir_flag) < 0) return -1; if ((error = collect_attr_files(repo, NULL, opts, pathname, &files)) < 0 || diff --git a/src/attr_file.c b/src/attr_file.c index 4a0d66e92..71bd20a0f 100644 --- a/src/attr_file.c +++ b/src/attr_file.c @@ -551,7 +551,6 @@ git_attr_assignment *git_attr_rule__lookup_assignment( int git_attr_path__init( git_attr_path *info, - git_repository *repo, const char *path, const char *base, git_dir_flag dir_flag) diff --git a/src/attr_file.h b/src/attr_file.h index a07cb4268..d634e6da9 100644 --- a/src/attr_file.h +++ b/src/attr_file.h @@ -227,7 +227,6 @@ typedef enum { GIT_DIR_FLAG_TRUE = 1, GIT_DIR_FLAG_FALSE = 0, GIT_DIR_FLAG_UNKNO extern int git_attr_path__init( git_attr_path *out, - git_repository *repo, const char *path, const char *base, git_dir_flag is_dir); diff --git a/src/ignore.c b/src/ignore.c index f7551cddb..9ead96ba6 100644 --- a/src/ignore.c +++ b/src/ignore.c @@ -468,7 +468,7 @@ int git_ignore__lookup( *out = GIT_IGNORE_NOTFOUND; if (git_attr_path__init( - &path, ignores->repo, pathname, git_repository_workdir(ignores->repo), dir_flag) < 0) + &path, pathname, git_repository_workdir(ignores->repo), dir_flag) < 0) return -1; /* first process builtins - success means path was found */ @@ -552,7 +552,7 @@ int git_ignore_path_is_ignored( else if (git_repository_is_bare(repo)) dir_flag = GIT_DIR_FLAG_FALSE; - if ((error = git_attr_path__init(&path, repo, pathname, workdir, dir_flag)) < 0 || + if ((error = git_attr_path__init(&path, pathname, workdir, dir_flag)) < 0 || (error = git_ignore__for_path(repo, path.path, &ignores)) < 0) goto cleanup; |