undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t0066: drop setup of "dir5"

Browse Source 
The symlink setup in t0066 makes several directories with links, dir4
through dir6. But ever since dir5 was introduced in fa1da7d2ee
(dir-iterator: add flags parameter to dir_iterator_begin, 2019-07-10),
it has never actually been used. It was left over from an earlier
iteration of the patch which tried to handle recursive symlinks
specially, as seen in:

  https://lore.kernel.org/git/20190502144829.4394-7-matheus.bernardino@usp.br/

It's not hurting any of the existing tests to be there, but the extra
setup is confusing to anybody trying to read and understand the tests.
Let's drop the extra directory, and we'll rename "dir6" to "dir5" so
nobody wonders whether the gap in naming is important.

Helped-by: Matheus Tavares Bernardino <matheus.tavb@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2023-02-16 19:40:29 -05:00 committed by Junio C Hamano
parent e00e56a7df
commit 3b0ebb7a8d
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
t/t0066-dir-iterator.sh
View File

@ -106,13 +106,7 @@ test_expect_success SYMLINKS 'setup dirs with symlinks' '
ln -s d dir4/a/e && ln -s d dir4/a/e &&
ln -s ../b dir4/a/f && ln -s ../b dir4/a/f &&
mkdir -p dir5/a/b && ln -s dir4 dir5
mkdir -p dir5/a/c &&
ln -s ../c dir5/a/b/d &&
ln -s ../ dir5/a/b/e &&
ln -s ../../ dir5/a/b/f &&
ln -s dir4 dir6
' '
test_expect_success SYMLINKS 'dir-iterator should not follow symlinks by default' ' test_expect_success SYMLINKS 'dir-iterator should not follow symlinks by default' '
@ -132,7 +126,7 @@ test_expect_success SYMLINKS 'dir-iterator should not follow symlinks by default
' '
test_expect_success SYMLINKS 'dir-iterator does not resolve top-level symlinks' ' test_expect_success SYMLINKS 'dir-iterator does not resolve top-level symlinks' '
test_must_fail test-tool dir-iterator ./dir6 >out && test_must_fail test-tool dir-iterator ./dir5 >out &&
grep "ENOTDIR" out grep "ENOTDIR" out
' '