diff options
| author | Taylor Blau <me@ttaylorr.com> | 2023-02-16 18:27:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-17 00:21:56 (GMT) |
| commit | e00e56a7df616659c90d107c3d31d362b5dff103 (patch) | |
| tree | 7631e8a47c5799297c3d4e4de8904ef0a8ff3fe8 /t/helper/test-dir-iterator.c | |
| parent | d9d677b2d8cc5f70499db04e633ba7a400f64cbf (diff) | |
| download | git-e00e56a7df616659c90d107c3d31d362b5dff103.zip git-e00e56a7df616659c90d107c3d31d362b5dff103.tar.gz git-e00e56a7df616659c90d107c3d31d362b5dff103.tar.bz2 | |
dir-iterator: drop unused `DIR_ITERATOR_FOLLOW_SYMLINKS`
The `FOLLOW_SYMLINKS` flag was added to the dir-iterator API in
fa1da7d2ee (dir-iterator: add flags parameter to dir_iterator_begin,
2019-07-10) in order to follow symbolic links while traversing through a
directory.
`FOLLOW_SYMLINKS` gained its first caller in ff7ccc8c9a (clone: use
dir-iterator to avoid explicit dir traversal, 2019-07-10), but it was
subsequently removed in 6f054f9fb3 (builtin/clone.c: disallow `--local`
clones with symlinks, 2022-07-28).
Since then, we've held on to the code for `DIR_ITERATOR_FOLLOW_SYMLINKS`
in the name of making minimally invasive changes during a security
embargo.
In fact, we even changed the dir-iterator API in bffc762f87
(dir-iterator: prevent top-level symlinks without FOLLOW_SYMLINKS,
2023-01-24) without having any non-test callers of that flag.
Now that we're past those security embargo(s), let's finalize our
cleanup of the `DIR_ITERATOR_FOLLOW_SYMLINKS` code and remove its
implementation since there are no remaining callers.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/helper/test-dir-iterator.c')
| -rw-r--r-- | t/helper/test-dir-iterator.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/t/helper/test-dir-iterator.c b/t/helper/test-dir-iterator.c index 659b6bf..6b297bd 100644 --- a/t/helper/test-dir-iterator.c +++ b/t/helper/test-dir-iterator.c @@ -15,7 +15,7 @@ static const char *error_name(int error_number) /* * usage: - * tool-test dir-iterator [--follow-symlinks] [--pedantic] directory_path + * tool-test dir-iterator [--pedantic] directory_path */ int cmd__dir_iterator(int argc, const char **argv) { @@ -24,9 +24,7 @@ int cmd__dir_iterator(int argc, const char **argv) int iter_status; for (++argv, --argc; *argv && starts_with(*argv, "--"); ++argv, --argc) { - if (strcmp(*argv, "--follow-symlinks") == 0) - flags |= DIR_ITERATOR_FOLLOW_SYMLINKS; - else if (strcmp(*argv, "--pedantic") == 0) + if (strcmp(*argv, "--pedantic") == 0) flags |= DIR_ITERATOR_PEDANTIC; else die("invalid option '%s'", *argv); |