Skip to content

Commit 63e36c5

Browse files
ethomsonethomson
committed
path: validate -> is_valid
Since we're returning a boolean about validation, the name is more properly "is valid".
1 parent 434a461 commit 63e36c5

File tree

8 files changed

+77
-77
lines changed

8 files changed

+77
-77
lines changed

‎src/checkout.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,14 +1281,14 @@ static int checkout_verify_paths(
12811281
unsigned int flags = GIT_PATH_REJECT_WORKDIR_DEFAULTS;
12821282

12831283
if (action & CHECKOUT_ACTION__REMOVE) {
1284-
if (!git_path_validate(repo, delta->old_file.path, delta->old_file.mode, flags)) {
1284+
if (!git_path_is_valid(repo, delta->old_file.path, delta->old_file.mode, flags)) {
12851285
git_error_set(GIT_ERROR_CHECKOUT, "cannot remove invalid path '%s'", delta->old_file.path);
12861286
return -1;
12871287
}
12881288
}
12891289

12901290
if (action & ~CHECKOUT_ACTION__REMOVE) {
1291-
if (!git_path_validate(repo, delta->new_file.path, delta->new_file.mode, flags)) {
1291+
if (!git_path_is_valid(repo, delta->new_file.path, delta->new_file.mode, flags)) {
12921292
git_error_set(GIT_ERROR_CHECKOUT, "cannot checkout to invalid path '%s'", delta->new_file.path);
12931293
return -1;
12941294
}

‎src/index.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ static int index_entry_create(
945945
if (st)
946946
mode = st->st_mode;
947947

948-
if (!git_path_validate(repo, path, mode, path_valid_flags)) {
948+
if (!git_path_is_valid(repo, path, mode, path_valid_flags)) {
949949
git_error_set(GIT_ERROR_INDEX, "invalid path: '%s'", path);
950950
return -1;
951951
}

‎src/path.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ GIT_INLINE(unsigned int) dotgit_flags(
285285
return flags;
286286
}
287287

288-
bool git_path_validate(
288+
bool git_path_is_valid(
289289
git_repository *repo,
290290
const char *path,
291291
uint16_t file_mode,

‎src/path.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#define GIT_PATH_REJECT_INDEX_DEFAULTS \
2626
GIT_FS_PATH_REJECT_TRAVERSAL | GIT_PATH_REJECT_DOT_GIT
2727

28-
extern bool git_path_validate(
28+
extern bool git_path_is_valid(
2929
git_repository *repo,
3030
const char *path,
3131
uint16_t file_mode,

‎src/refdb_fs.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ static int loose_lock(git_filebuf *file, refdb_fs_backend *backend, const char *
818818
GIT_ASSERT_ARG(backend);
819819
GIT_ASSERT_ARG(name);
820820

821-
if (!git_path_validate(backend->repo, name, 0, GIT_FS_PATH_REJECT_FILESYSTEM_DEFAULTS)) {
821+
if (!git_path_is_valid(backend->repo, name, 0, GIT_FS_PATH_REJECT_FILESYSTEM_DEFAULTS)) {
822822
git_error_set(GIT_ERROR_INVALID, "invalid reference name '%s'", name);
823823
return GIT_EINVALIDSPEC;
824824
}
@@ -1857,7 +1857,7 @@ static int lock_reflog(git_filebuf *file, refdb_fs_backend *backend, const char
18571857

18581858
repo = backend->repo;
18591859

1860-
if (!git_path_validate(backend->repo, refname, 0, GIT_FS_PATH_REJECT_FILESYSTEM_DEFAULTS)) {
1860+
if (!git_path_is_valid(backend->repo, refname, 0, GIT_FS_PATH_REJECT_FILESYSTEM_DEFAULTS)) {
18611861
git_error_set(GIT_ERROR_INVALID, "invalid reference name '%s'", refname);
18621862
return GIT_EINVALIDSPEC;
18631863
}

‎src/submodule.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ int git_submodule_name_is_valid(git_repository *repo, const char *name, int flag
423423
git_str_attach_notowned(&buf, name, strlen(name));
424424
}
425425

426-
isvalid = git_path_validate(repo, buf.ptr, 0, flags);
426+
isvalid = git_path_is_valid(repo, buf.ptr, 0, flags);
427427
git_str_dispose(&buf);
428428

429429
return isvalid;

‎src/tree.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ GIT_INLINE(git_filemode_t) normalize_filemode(git_filemode_t filemode)
5555
static int valid_entry_name(git_repository *repo, const char *filename)
5656
{
5757
return *filename != '\0' &&
58-
git_path_validate(repo, filename, 0,
58+
git_path_is_valid(repo, filename, 0,
5959
GIT_FS_PATH_REJECT_TRAVERSAL | GIT_PATH_REJECT_DOT_GIT | GIT_FS_PATH_REJECT_SLASH);
6060
}
6161

‎tests/path/dotgit.c‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ void test_path_dotgit__dotgit_modules(void)
114114

115115
void test_path_dotgit__dotgit_modules_symlink(void)
116116
{
117-
cl_assert_equal_b(true, git_path_validate(NULL, ".gitmodules", 0, GIT_PATH_REJECT_DOT_GIT_HFS|GIT_PATH_REJECT_DOT_GIT_NTFS));
118-
cl_assert_equal_b(false, git_path_validate(NULL, ".gitmodules", S_IFLNK, GIT_PATH_REJECT_DOT_GIT_HFS));
119-
cl_assert_equal_b(false, git_path_validate(NULL, ".gitmodules", S_IFLNK, GIT_PATH_REJECT_DOT_GIT_NTFS));
120-
cl_assert_equal_b(false, git_path_validate(NULL, ".gitmodules . .::$DATA", S_IFLNK, GIT_PATH_REJECT_DOT_GIT_NTFS));
117+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".gitmodules", 0, GIT_PATH_REJECT_DOT_GIT_HFS|GIT_PATH_REJECT_DOT_GIT_NTFS));
118+
cl_assert_equal_b(false, git_path_is_valid(NULL, ".gitmodules", S_IFLNK, GIT_PATH_REJECT_DOT_GIT_HFS));
119+
cl_assert_equal_b(false, git_path_is_valid(NULL, ".gitmodules", S_IFLNK, GIT_PATH_REJECT_DOT_GIT_NTFS));
120+
cl_assert_equal_b(false, git_path_is_valid(NULL, ".gitmodules . .::$DATA", S_IFLNK, GIT_PATH_REJECT_DOT_GIT_NTFS));
121121
}
122122

123123
void test_core_path__git_fs_path_is_file(void)
@@ -131,76 +131,76 @@ void test_core_path__git_fs_path_is_file(void)
131131

132132
void test_path_dotgit__isvalid_dot_git(void)
133133
{
134-
cl_assert_equal_b(true, git_path_validate(NULL, ".git", 0, 0));
135-
cl_assert_equal_b(true, git_path_validate(NULL, ".git/foo", 0, 0));
136-
cl_assert_equal_b(true, git_path_validate(NULL, "foo/.git", 0, 0));
137-
cl_assert_equal_b(true, git_path_validate(NULL, "foo/.git/bar", 0, 0));
138-
cl_assert_equal_b(true, git_path_validate(NULL, "foo/.GIT/bar", 0, 0));
139-
cl_assert_equal_b(true, git_path_validate(NULL, "foo/bar/.Git", 0, 0));
140-
141-
cl_assert_equal_b(false, git_path_validate(NULL, ".git", 0, GIT_PATH_REJECT_DOT_GIT_LITERAL));
142-
cl_assert_equal_b(false, git_path_validate(NULL, ".git/foo", 0, GIT_PATH_REJECT_DOT_GIT_LITERAL));
143-
cl_assert_equal_b(false, git_path_validate(NULL, "foo/.git", 0, GIT_PATH_REJECT_DOT_GIT_LITERAL));
144-
cl_assert_equal_b(false, git_path_validate(NULL, "foo/.git/bar", 0, GIT_PATH_REJECT_DOT_GIT_LITERAL));
145-
cl_assert_equal_b(false, git_path_validate(NULL, "foo/.GIT/bar", 0, GIT_PATH_REJECT_DOT_GIT_LITERAL));
146-
cl_assert_equal_b(false, git_path_validate(NULL, "foo/bar/.Git", 0, GIT_PATH_REJECT_DOT_GIT_LITERAL));
147-
148-
cl_assert_equal_b(true, git_path_validate(NULL, "!git", 0, 0));
149-
cl_assert_equal_b(true, git_path_validate(NULL, "foo/!git", 0, 0));
150-
cl_assert_equal_b(true, git_path_validate(NULL, "!git/bar", 0, 0));
151-
cl_assert_equal_b(true, git_path_validate(NULL, ".tig", 0, 0));
152-
cl_assert_equal_b(true, git_path_validate(NULL, "foo/.tig", 0, 0));
153-
cl_assert_equal_b(true, git_path_validate(NULL, ".tig/bar", 0, 0));
134+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".git", 0, 0));
135+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".git/foo", 0, 0));
136+
cl_assert_equal_b(true, git_path_is_valid(NULL, "foo/.git", 0, 0));
137+
cl_assert_equal_b(true, git_path_is_valid(NULL, "foo/.git/bar", 0, 0));
138+
cl_assert_equal_b(true, git_path_is_valid(NULL, "foo/.GIT/bar", 0, 0));
139+
cl_assert_equal_b(true, git_path_is_valid(NULL, "foo/bar/.Git", 0, 0));
140+
141+
cl_assert_equal_b(false, git_path_is_valid(NULL, ".git", 0, GIT_PATH_REJECT_DOT_GIT_LITERAL));
142+
cl_assert_equal_b(false, git_path_is_valid(NULL, ".git/foo", 0, GIT_PATH_REJECT_DOT_GIT_LITERAL));
143+
cl_assert_equal_b(false, git_path_is_valid(NULL, "foo/.git", 0, GIT_PATH_REJECT_DOT_GIT_LITERAL));
144+
cl_assert_equal_b(false, git_path_is_valid(NULL, "foo/.git/bar", 0, GIT_PATH_REJECT_DOT_GIT_LITERAL));
145+
cl_assert_equal_b(false, git_path_is_valid(NULL, "foo/.GIT/bar", 0, GIT_PATH_REJECT_DOT_GIT_LITERAL));
146+
cl_assert_equal_b(false, git_path_is_valid(NULL, "foo/bar/.Git", 0, GIT_PATH_REJECT_DOT_GIT_LITERAL));
147+
148+
cl_assert_equal_b(true, git_path_is_valid(NULL, "!git", 0, 0));
149+
cl_assert_equal_b(true, git_path_is_valid(NULL, "foo/!git", 0, 0));
150+
cl_assert_equal_b(true, git_path_is_valid(NULL, "!git/bar", 0, 0));
151+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".tig", 0, 0));
152+
cl_assert_equal_b(true, git_path_is_valid(NULL, "foo/.tig", 0, 0));
153+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".tig/bar", 0, 0));
154154
}
155155

156156
void test_path_dotgit__isvalid_dotgit_ntfs(void)
157157
{
158-
cl_assert_equal_b(true, git_path_validate(NULL, ".git", 0, 0));
159-
cl_assert_equal_b(true, git_path_validate(NULL, ".git ", 0, 0));
160-
cl_assert_equal_b(true, git_path_validate(NULL, ".git.", 0, 0));
161-
cl_assert_equal_b(true, git_path_validate(NULL, ".git.. .", 0, 0));
162-
163-
cl_assert_equal_b(true, git_path_validate(NULL, "git~1", 0, 0));
164-
cl_assert_equal_b(true, git_path_validate(NULL, "git~1 ", 0, 0));
165-
cl_assert_equal_b(true, git_path_validate(NULL, "git~1.", 0, 0));
166-
cl_assert_equal_b(true, git_path_validate(NULL, "git~1.. .", 0, 0));
167-
168-
cl_assert_equal_b(false, git_path_validate(NULL, ".git", 0, GIT_PATH_REJECT_DOT_GIT_NTFS));
169-
cl_assert_equal_b(false, git_path_validate(NULL, ".git ", 0, GIT_PATH_REJECT_DOT_GIT_NTFS));
170-
cl_assert_equal_b(false, git_path_validate(NULL, ".git.", 0, GIT_PATH_REJECT_DOT_GIT_NTFS));
171-
cl_assert_equal_b(false, git_path_validate(NULL, ".git.. .", 0, GIT_PATH_REJECT_DOT_GIT_NTFS));
172-
173-
cl_assert_equal_b(false, git_path_validate(NULL, "git~1", 0, GIT_PATH_REJECT_DOT_GIT_NTFS));
174-
cl_assert_equal_b(false, git_path_validate(NULL, "git~1 ", 0, GIT_PATH_REJECT_DOT_GIT_NTFS));
175-
cl_assert_equal_b(false, git_path_validate(NULL, "git~1.", 0, GIT_PATH_REJECT_DOT_GIT_NTFS));
176-
cl_assert_equal_b(false, git_path_validate(NULL, "git~1.. .", 0, GIT_PATH_REJECT_DOT_GIT_NTFS));
158+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".git", 0, 0));
159+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".git ", 0, 0));
160+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".git.", 0, 0));
161+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".git.. .", 0, 0));
162+
163+
cl_assert_equal_b(true, git_path_is_valid(NULL, "git~1", 0, 0));
164+
cl_assert_equal_b(true, git_path_is_valid(NULL, "git~1 ", 0, 0));
165+
cl_assert_equal_b(true, git_path_is_valid(NULL, "git~1.", 0, 0));
166+
cl_assert_equal_b(true, git_path_is_valid(NULL, "git~1.. .", 0, 0));
167+
168+
cl_assert_equal_b(false, git_path_is_valid(NULL, ".git", 0, GIT_PATH_REJECT_DOT_GIT_NTFS));
169+
cl_assert_equal_b(false, git_path_is_valid(NULL, ".git ", 0, GIT_PATH_REJECT_DOT_GIT_NTFS));
170+
cl_assert_equal_b(false, git_path_is_valid(NULL, ".git.", 0, GIT_PATH_REJECT_DOT_GIT_NTFS));
171+
cl_assert_equal_b(false, git_path_is_valid(NULL, ".git.. .", 0, GIT_PATH_REJECT_DOT_GIT_NTFS));
172+
173+
cl_assert_equal_b(false, git_path_is_valid(NULL, "git~1", 0, GIT_PATH_REJECT_DOT_GIT_NTFS));
174+
cl_assert_equal_b(false, git_path_is_valid(NULL, "git~1 ", 0, GIT_PATH_REJECT_DOT_GIT_NTFS));
175+
cl_assert_equal_b(false, git_path_is_valid(NULL, "git~1.", 0, GIT_PATH_REJECT_DOT_GIT_NTFS));
176+
cl_assert_equal_b(false, git_path_is_valid(NULL, "git~1.. .", 0, GIT_PATH_REJECT_DOT_GIT_NTFS));
177177
}
178178

179179
void test_path_dotgit__isvalid_dotgit_with_hfs_ignorables(void)
180180
{
181-
cl_assert_equal_b(false, git_path_validate(NULL, ".git", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
182-
cl_assert_equal_b(false, git_path_validate(NULL, ".git\xe2\x80\x8c", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
183-
cl_assert_equal_b(false, git_path_validate(NULL, ".gi\xe2\x80\x8dT", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
184-
cl_assert_equal_b(false, git_path_validate(NULL, ".g\xe2\x80\x8eIt", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
185-
cl_assert_equal_b(false, git_path_validate(NULL, ".\xe2\x80\x8fgIt", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
186-
cl_assert_equal_b(false, git_path_validate(NULL, "\xe2\x80\xaa.gIt", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
187-
188-
cl_assert_equal_b(false, git_path_validate(NULL, "\xe2\x80\xab.\xe2\x80\xacG\xe2\x80\xadI\xe2\x80\xaet", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
189-
cl_assert_equal_b(false, git_path_validate(NULL, "\xe2\x81\xab.\xe2\x80\xaaG\xe2\x81\xabI\xe2\x80\xact", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
190-
cl_assert_equal_b(false, git_path_validate(NULL, "\xe2\x81\xad.\xe2\x80\xaeG\xef\xbb\xbfIT", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
191-
192-
cl_assert_equal_b(true, git_path_validate(NULL, ".", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
193-
cl_assert_equal_b(true, git_path_validate(NULL, ".g", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
194-
cl_assert_equal_b(true, git_path_validate(NULL, ".gi", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
195-
cl_assert_equal_b(true, git_path_validate(NULL, " .git", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
196-
cl_assert_equal_b(true, git_path_validate(NULL, "..git\xe2\x80\x8c", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
197-
cl_assert_equal_b(true, git_path_validate(NULL, ".gi\xe2\x80\x8dT.", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
198-
cl_assert_equal_b(true, git_path_validate(NULL, ".g\xe2\x80It", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
199-
cl_assert_equal_b(true, git_path_validate(NULL, ".\xe2gIt", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
200-
cl_assert_equal_b(true, git_path_validate(NULL, "\xe2\x80\xaa.gi", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
201-
cl_assert_equal_b(true, git_path_validate(NULL, ".gi\x80\x8dT", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
202-
cl_assert_equal_b(true, git_path_validate(NULL, ".gi\x8dT", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
203-
cl_assert_equal_b(true, git_path_validate(NULL, ".g\xe2i\x80T\x8e", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
204-
cl_assert_equal_b(true, git_path_validate(NULL, ".git\xe2\x80\xbf", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
205-
cl_assert_equal_b(true, git_path_validate(NULL, ".git\xe2\xab\x81", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
181+
cl_assert_equal_b(false, git_path_is_valid(NULL, ".git", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
182+
cl_assert_equal_b(false, git_path_is_valid(NULL, ".git\xe2\x80\x8c", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
183+
cl_assert_equal_b(false, git_path_is_valid(NULL, ".gi\xe2\x80\x8dT", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
184+
cl_assert_equal_b(false, git_path_is_valid(NULL, ".g\xe2\x80\x8eIt", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
185+
cl_assert_equal_b(false, git_path_is_valid(NULL, ".\xe2\x80\x8fgIt", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
186+
cl_assert_equal_b(false, git_path_is_valid(NULL, "\xe2\x80\xaa.gIt", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
187+
188+
cl_assert_equal_b(false, git_path_is_valid(NULL, "\xe2\x80\xab.\xe2\x80\xacG\xe2\x80\xadI\xe2\x80\xaet", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
189+
cl_assert_equal_b(false, git_path_is_valid(NULL, "\xe2\x81\xab.\xe2\x80\xaaG\xe2\x81\xabI\xe2\x80\xact", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
190+
cl_assert_equal_b(false, git_path_is_valid(NULL, "\xe2\x81\xad.\xe2\x80\xaeG\xef\xbb\xbfIT", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
191+
192+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
193+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".g", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
194+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".gi", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
195+
cl_assert_equal_b(true, git_path_is_valid(NULL, " .git", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
196+
cl_assert_equal_b(true, git_path_is_valid(NULL, "..git\xe2\x80\x8c", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
197+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".gi\xe2\x80\x8dT.", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
198+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".g\xe2\x80It", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
199+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".\xe2gIt", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
200+
cl_assert_equal_b(true, git_path_is_valid(NULL, "\xe2\x80\xaa.gi", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
201+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".gi\x80\x8dT", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
202+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".gi\x8dT", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
203+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".g\xe2i\x80T\x8e", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
204+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".git\xe2\x80\xbf", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
205+
cl_assert_equal_b(true, git_path_is_valid(NULL, ".git\xe2\xab\x81", 0, GIT_PATH_REJECT_DOT_GIT_HFS));
206206
}

0 commit comments

Comments
 (0)