Commit 46508fe64737c2fe71d9e3221c56fbe0fae6996c
2021-09-26T11:28:47
attr_file: don't take the `repo` as an arg The `repo` argument is now unnecessary. Remove it.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108
diff --git a/src/attr.c b/src/attr.c
index 14eab5b..92ff6c7 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 4a0d66e..71bd20a 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 a07cb42..d634e6d 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 f7551cd..9ead96b 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;
diff --git a/tests/attr/lookup.c b/tests/attr/lookup.c
index bfb2e87..f19f38f 100644
--- a/tests/attr/lookup.c
+++ b/tests/attr/lookup.c
@@ -13,7 +13,7 @@ void test_attr_lookup__simple(void)
cl_assert_equal_s(cl_fixture("attr/attr0"), file->entry->path);
cl_assert(file->rules.length == 1);
- cl_git_pass(git_attr_path__init(&path, NULL, "test", NULL, GIT_DIR_FLAG_UNKNOWN));
+ cl_git_pass(git_attr_path__init(&path, "test", NULL, GIT_DIR_FLAG_UNKNOWN));
cl_assert_equal_s("test", path.path);
cl_assert_equal_s("test", path.basename);
cl_assert(!path.is_dir);
@@ -36,7 +36,7 @@ static void run_test_cases(git_attr_file *file, struct attr_expected *cases, int
int error;
for (c = cases; c->path != NULL; c++) {
- cl_git_pass(git_attr_path__init(&path, NULL, c->path, NULL, GIT_DIR_FLAG_UNKNOWN));
+ cl_git_pass(git_attr_path__init(&path, c->path, NULL, GIT_DIR_FLAG_UNKNOWN));
if (force_dir)
path.is_dir = 1;
@@ -133,7 +133,7 @@ void test_attr_lookup__match_variants(void)
cl_assert_equal_s(cl_fixture("attr/attr1"), file->entry->path);
cl_assert(file->rules.length == 10);
- cl_git_pass(git_attr_path__init(&path, NULL, "/testing/for/pat0", NULL, GIT_DIR_FLAG_UNKNOWN));
+ cl_git_pass(git_attr_path__init(&path, "/testing/for/pat0", NULL, GIT_DIR_FLAG_UNKNOWN));
cl_assert_equal_s("pat0", path.basename);
run_test_cases(file, cases, 0);