* [PATCH] replace test -f with test_path_is_file
@ 2021-03-19 9:52 Krushnal Patel via GitGitGadget
2021-03-19 18:04 ` Junio C Hamano
2021-03-19 19:24 ` [PATCH v2 0/2] " Krushnal Patel via GitGitGadget
0 siblings, 2 replies; 6+ messages in thread
From: Krushnal Patel via GitGitGadget @ 2021-03-19 9:52 UTC (permalink / raw)
To: git; +Cc: Krushnal Patel, krush11
From: krush11 <krushnalpatel11@gmail.com>
Although has the same functionality as test_path_is_file(), in
the case where test_path_is_file() fails, we get much better debugging
information.
Replace with test_path_is_file so that future developers
will have a better experience debugging these test cases.
Signed-off-by: Krushnal Patel <krushnalpatel11@gmail.com>
---
replace test -f with test_path_is_file
Although has the same functionality as test_path_is_file(), in the case
where test_path_is_file() fails, we get much better debugging
information.
Replace with test_path_is_file so that future developers will have a
better experience debugging these test cases.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-982%2Fkrush11%2Fnext-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-982/krush11/next-v1
Pull-Request: https://github.com/git/git/pull/982
t/t7300-clean.sh | 276 +++++++++++++++++++++++------------------------
1 file changed, 138 insertions(+), 138 deletions(-)
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index a74816ca8b46..a599c4210085 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -28,15 +28,15 @@ test_expect_success 'git clean with skip-worktree .gitignore' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git clean &&
- test -f Makefile &&
- test -f README &&
- test -f src/part1.c &&
- test -f src/part2.c &&
+ test_path_is_file Makefile &&
+ test_path_is_file README &&
+ test_path_is_file src/part1.c &&
+ test_path_is_file src/part2.c &&
test ! -f a.out &&
test ! -f src/part3.c &&
- test -f docs/manual.txt &&
- test -f obj.o &&
- test -f build/lib.so &&
+ test_path_is_file docs/manual.txt &&
+ test_path_is_file obj.o &&
+ test_path_is_file build/lib.so &&
git update-index --no-skip-worktree .gitignore &&
git checkout .gitignore
'
@@ -46,15 +46,15 @@ test_expect_success 'git clean' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git clean &&
- test -f Makefile &&
- test -f README &&
- test -f src/part1.c &&
- test -f src/part2.c &&
+ test_path_is_file Makefile &&
+ test_path_is_file README &&
+ test_path_is_file src/part1.c &&
+ test_path_is_file src/part2.c &&
test ! -f a.out &&
test ! -f src/part3.c &&
- test -f docs/manual.txt &&
- test -f obj.o &&
- test -f build/lib.so
+ test_path_is_file docs/manual.txt &&
+ test_path_is_file obj.o &&
+ test_path_is_file build/lib.so
'
@@ -63,15 +63,15 @@ test_expect_success 'git clean src/' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git clean src/ &&
- test -f Makefile &&
- test -f README &&
- test -f src/part1.c &&
- test -f src/part2.c &&
- test -f a.out &&
+ test_path_is_file Makefile &&
+ test_path_is_file README &&
+ test_path_is_file src/part1.c &&
+ test_path_is_file src/part2.c &&
+ test_path_is_file a.out &&
test ! -f src/part3.c &&
- test -f docs/manual.txt &&
- test -f obj.o &&
- test -f build/lib.so
+ test_path_is_file docs/manual.txt &&
+ test_path_is_file obj.o &&
+ test_path_is_file build/lib.so
'
@@ -80,15 +80,15 @@ test_expect_success 'git clean src/ src/' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git clean src/ src/ &&
- test -f Makefile &&
- test -f README &&
- test -f src/part1.c &&
- test -f src/part2.c &&
- test -f a.out &&
+ test_path_is_file Makefile &&
+ test_path_is_file README &&
+ test_path_is_file src/part1.c &&
+ test_path_is_file src/part2.c &&
+ test_path_is_file a.out &&
test ! -f src/part3.c &&
- test -f docs/manual.txt &&
- test -f obj.o &&
- test -f build/lib.so
+ test_path_is_file docs/manual.txt &&
+ test_path_is_file obj.o &&
+ test_path_is_file build/lib.so
'
@@ -97,16 +97,16 @@ test_expect_success 'git clean with prefix' '
mkdir -p build docs src/test &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so src/test/1.c &&
(cd src/ && git clean) &&
- test -f Makefile &&
- test -f README &&
- test -f src/part1.c &&
- test -f src/part2.c &&
- test -f a.out &&
+ test_path_is_file Makefile &&
+ test_path_is_file README &&
+ test_path_is_file src/part1.c &&
+ test_path_is_file src/part2.c &&
+ test_path_is_file a.out &&
test ! -f src/part3.c &&
- test -f src/test/1.c &&
- test -f docs/manual.txt &&
- test -f obj.o &&
- test -f build/lib.so
+ test_path_is_file src/test/1.c &&
+ test_path_is_file docs/manual.txt &&
+ test_path_is_file obj.o &&
+ test_path_is_file build/lib.so
'
@@ -162,16 +162,16 @@ test_expect_success 'git clean -d with prefix and path' '
mkdir -p build docs src/feature &&
touch a.out src/part3.c src/feature/file.c docs/manual.txt obj.o build/lib.so &&
(cd src/ && git clean -d feature/) &&
- test -f Makefile &&
- test -f README &&
- test -f src/part1.c &&
- test -f src/part2.c &&
- test -f a.out &&
- test -f src/part3.c &&
+ test_path_is_file Makefile &&
+ test_path_is_file README &&
+ test_path_is_file src/part1.c &&
+ test_path_is_file src/part2.c &&
+ test_path_is_file a.out &&
+ test_path_is_file src/part3.c &&
test ! -f src/feature/file.c &&
- test -f docs/manual.txt &&
- test -f obj.o &&
- test -f build/lib.so
+ test_path_is_file docs/manual.txt &&
+ test_path_is_file obj.o &&
+ test_path_is_file build/lib.so
'
@@ -181,16 +181,16 @@ test_expect_success SYMLINKS 'git clean symbolic link' '
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
ln -s docs/manual.txt src/part4.c &&
git clean &&
- test -f Makefile &&
- test -f README &&
- test -f src/part1.c &&
- test -f src/part2.c &&
+ test_path_is_file Makefile &&
+ test_path_is_file README &&
+ test_path_is_file src/part1.c &&
+ test_path_is_file src/part2.c &&
test ! -f a.out &&
test ! -f src/part3.c &&
test ! -f src/part4.c &&
- test -f docs/manual.txt &&
- test -f obj.o &&
- test -f build/lib.so
+ test_path_is_file docs/manual.txt &&
+ test_path_is_file obj.o &&
+ test_path_is_file build/lib.so
'
@@ -198,13 +198,13 @@ test_expect_success 'git clean with wildcard' '
touch a.clean b.clean other.c &&
git clean "*.clean" &&
- test -f Makefile &&
- test -f README &&
- test -f src/part1.c &&
- test -f src/part2.c &&
+ test_path_is_file Makefile &&
+ test_path_is_file README &&
+ test_path_is_file src/part1.c &&
+ test_path_is_file src/part2.c &&
test ! -f a.clean &&
test ! -f b.clean &&
- test -f other.c
+ test_path_is_file other.c
'
@@ -213,15 +213,15 @@ test_expect_success 'git clean -n' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git clean -n &&
- test -f Makefile &&
- test -f README &&
- test -f src/part1.c &&
- test -f src/part2.c &&
- test -f a.out &&
- test -f src/part3.c &&
- test -f docs/manual.txt &&
- test -f obj.o &&
- test -f build/lib.so
+ test_path_is_file Makefile &&
+ test_path_is_file README &&
+ test_path_is_file src/part1.c &&
+ test_path_is_file src/part2.c &&
+ test_path_is_file a.out &&
+ test_path_is_file src/part3.c &&
+ test_path_is_file docs/manual.txt &&
+ test_path_is_file obj.o &&
+ test_path_is_file build/lib.so
'
@@ -230,15 +230,15 @@ test_expect_success 'git clean -d' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git clean -d &&
- test -f Makefile &&
- test -f README &&
- test -f src/part1.c &&
- test -f src/part2.c &&
+ test_path_is_file Makefile &&
+ test_path_is_file README &&
+ test_path_is_file src/part1.c &&
+ test_path_is_file src/part2.c &&
test ! -f a.out &&
test ! -f src/part3.c &&
test ! -d docs &&
- test -f obj.o &&
- test -f build/lib.so
+ test_path_is_file obj.o &&
+ test_path_is_file build/lib.so
'
@@ -247,16 +247,16 @@ test_expect_success 'git clean -d src/ examples/' '
mkdir -p build docs examples &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so examples/1.c &&
git clean -d src/ examples/ &&
- test -f Makefile &&
- test -f README &&
- test -f src/part1.c &&
- test -f src/part2.c &&
- test -f a.out &&
+ test_path_is_file Makefile &&
+ test_path_is_file README &&
+ test_path_is_file src/part1.c &&
+ test_path_is_file src/part2.c &&
+ test_path_is_file a.out &&
test ! -f src/part3.c &&
test ! -f examples/1.c &&
- test -f docs/manual.txt &&
- test -f obj.o &&
- test -f build/lib.so
+ test_path_is_file docs/manual.txt &&
+ test_path_is_file obj.o &&
+ test_path_is_file build/lib.so
'
@@ -265,15 +265,15 @@ test_expect_success 'git clean -x' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git clean -x &&
- test -f Makefile &&
- test -f README &&
- test -f src/part1.c &&
- test -f src/part2.c &&
+ test_path_is_file Makefile &&
+ test_path_is_file README &&
+ test_path_is_file src/part1.c &&
+ test_path_is_file src/part2.c &&
test ! -f a.out &&
test ! -f src/part3.c &&
- test -f docs/manual.txt &&
+ test_path_is_file docs/manual.txt &&
test ! -f obj.o &&
- test -f build/lib.so
+ test_path_is_file build/lib.so
'
@@ -282,10 +282,10 @@ test_expect_success 'git clean -d -x' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git clean -d -x &&
- test -f Makefile &&
- test -f README &&
- test -f src/part1.c &&
- test -f src/part2.c &&
+ test_path_is_file Makefile &&
+ test_path_is_file README &&
+ test_path_is_file src/part1.c &&
+ test_path_is_file src/part2.c &&
test ! -f a.out &&
test ! -f src/part3.c &&
test ! -d docs &&
@@ -299,12 +299,12 @@ test_expect_success 'git clean -d -x with ignored tracked directory' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git clean -d -x -e src &&
- test -f Makefile &&
- test -f README &&
- test -f src/part1.c &&
- test -f src/part2.c &&
+ test_path_is_file Makefile &&
+ test_path_is_file README &&
+ test_path_is_file src/part1.c &&
+ test_path_is_file src/part2.c &&
test ! -f a.out &&
- test -f src/part3.c &&
+ test_path_is_file src/part3.c &&
test ! -d docs &&
test ! -f obj.o &&
test ! -d build
@@ -316,15 +316,15 @@ test_expect_success 'git clean -X' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git clean -X &&
- test -f Makefile &&
- test -f README &&
- test -f src/part1.c &&
- test -f src/part2.c &&
- test -f a.out &&
- test -f src/part3.c &&
- test -f docs/manual.txt &&
+ test_path_is_file Makefile &&
+ test_path_is_file README &&
+ test_path_is_file src/part1.c &&
+ test_path_is_file src/part2.c &&
+ test_path_is_file a.out &&
+ test_path_is_file src/part3.c &&
+ test_path_is_file docs/manual.txt &&
test ! -f obj.o &&
- test -f build/lib.so
+ test_path_is_file build/lib.so
'
@@ -333,13 +333,13 @@ test_expect_success 'git clean -d -X' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git clean -d -X &&
- test -f Makefile &&
- test -f README &&
- test -f src/part1.c &&
- test -f src/part2.c &&
- test -f a.out &&
- test -f src/part3.c &&
- test -f docs/manual.txt &&
+ test_path_is_file Makefile &&
+ test_path_is_file README &&
+ test_path_is_file src/part1.c &&
+ test_path_is_file src/part2.c &&
+ test_path_is_file a.out &&
+ test_path_is_file src/part3.c &&
+ test_path_is_file docs/manual.txt &&
test ! -f obj.o &&
test ! -d build
@@ -350,13 +350,13 @@ test_expect_success 'git clean -d -X with ignored tracked directory' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git clean -d -X -e src &&
- test -f Makefile &&
- test -f README &&
- test -f src/part1.c &&
- test -f src/part2.c &&
- test -f a.out &&
+ test_path_is_file Makefile &&
+ test_path_is_file README &&
+ test_path_is_file src/part1.c &&
+ test_path_is_file src/part2.c &&
+ test_path_is_file a.out &&
test ! -f src/part3.c &&
- test -f docs/manual.txt &&
+ test_path_is_file docs/manual.txt &&
test ! -f obj.o &&
test ! -d build
@@ -381,29 +381,29 @@ test_expect_success 'clean.requireForce and -n' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
git clean -n &&
- test -f Makefile &&
- test -f README &&
- test -f src/part1.c &&
- test -f src/part2.c &&
- test -f a.out &&
- test -f src/part3.c &&
- test -f docs/manual.txt &&
- test -f obj.o &&
- test -f build/lib.so
+ test_path_is_file Makefile &&
+ test_path_is_file README &&
+ test_path_is_file src/part1.c &&
+ test_path_is_file src/part2.c &&
+ test_path_is_file a.out &&
+ test_path_is_file src/part3.c &&
+ test_path_is_file docs/manual.txt &&
+ test_path_is_file obj.o &&
+ test_path_is_file build/lib.so
'
test_expect_success 'clean.requireForce and -f' '
git clean -f &&
- test -f README &&
- test -f src/part1.c &&
- test -f src/part2.c &&
+ test_path_is_file README &&
+ test_path_is_file src/part1.c &&
+ test_path_is_file src/part2.c &&
test ! -f a.out &&
test ! -f src/part3.c &&
- test -f docs/manual.txt &&
- test -f obj.o &&
- test -f build/lib.so
+ test_path_is_file docs/manual.txt &&
+ test_path_is_file obj.o &&
+ test_path_is_file build/lib.so
'
@@ -446,10 +446,10 @@ test_expect_success 'nested git work tree' '
test_commit deeply.nested deeper.world
) &&
git clean -f -d &&
- test -f foo/.git/index &&
- test -f foo/hello.world &&
- test -f baz/boo/.git/index &&
- test -f baz/boo/deeper.world &&
+ test_path_is_file foo/.git/index &&
+ test_path_is_file foo/hello.world &&
+ test_path_is_file baz/boo/.git/index &&
+ test_path_is_file baz/boo/deeper.world &&
! test -d bar
'
base-commit: 576ba9dcdaf1007243f5a5cb4bf1a1e7b8fcf850
--
gitgitgadget
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] replace test -f with test_path_is_file 2021-03-19 9:52 [PATCH] replace test -f with test_path_is_file Krushnal Patel via GitGitGadget @ 2021-03-19 18:04 ` Junio C Hamano 2021-03-19 19:24 ` [PATCH v2 0/2] " Krushnal Patel via GitGitGadget 1 sibling, 0 replies; 6+ messages in thread From: Junio C Hamano @ 2021-03-19 18:04 UTC (permalink / raw) To: Krushnal Patel via GitGitGadget; +Cc: git, Krushnal Patel "Krushnal Patel via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: krush11 <krushnalpatel11@gmail.com> > > Although has the same functionality as test_path_is_file(), in > the case where test_path_is_file() fails, we get much better debugging > information. > > Replace with test_path_is_file so that future developers > will have a better experience debugging these test cases. While this change is not wrong per-se, in the context of this test script, I think the original use of "test -f" is not quite right to begin with. These are all "even after running 'git clean', these paths should exist without getting removed by mistake", so the intent of these "test -f" invocations are actually "test -e". Similarly, the invocations of "test ! -f" we see (and there also is at least one "! test -d") mean to say "these paths should be gone as the result of running 'git clean'". If by some accident a directory exists at the path that is checked with "test ! -f" due to a bug in 'git clean', these tests will not catch such a bug, because a directory does not pass "test -f". So most likely these negative tests this patch does not convert are better off being spelled as "! test -e", too. It would be more appropriate to use test_path_exists and test_path_is_missing to replace these "must exist as a file" and "must not exist as a file". Thanks. ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 0/2] replace test -f with test_path_is_file 2021-03-19 9:52 [PATCH] replace test -f with test_path_is_file Krushnal Patel via GitGitGadget 2021-03-19 18:04 ` Junio C Hamano @ 2021-03-19 19:24 ` Krushnal Patel via GitGitGadget 2021-03-19 19:24 ` [PATCH v2 1/2] " krush11 via GitGitGadget 2021-03-19 19:24 ` [PATCH v2 2/2] replaced test -f and test ! -f krush11 via GitGitGadget 1 sibling, 2 replies; 6+ messages in thread From: Krushnal Patel via GitGitGadget @ 2021-03-19 19:24 UTC (permalink / raw) To: git; +Cc: Krushnal Patel Although has the same functionality as test_path_is_file(), in the case where test_path_is_file() fails, we get much better debugging information. Replace with test_path_is_file so that future developers will have a better experience debugging these test cases. krush11 (2): replace test -f with test_path_is_file replaced test -f and test ! -f t/t7300-clean.sh | 376 +++++++++++++++++++++++------------------------ 1 file changed, 188 insertions(+), 188 deletions(-) base-commit: 576ba9dcdaf1007243f5a5cb4bf1a1e7b8fcf850 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-982%2Fkrush11%2Fnext-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-982/krush11/next-v2 Pull-Request: https://github.com/git/git/pull/982 Range-diff vs v1: 1: e5f92e3882cd = 1: e5f92e3882cd replace test -f with test_path_is_file -: ------------ > 2: a31a147a34f8 replaced test -f and test ! -f -- gitgitgadget ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/2] replace test -f with test_path_is_file 2021-03-19 19:24 ` [PATCH v2 0/2] " Krushnal Patel via GitGitGadget @ 2021-03-19 19:24 ` krush11 via GitGitGadget 2021-03-19 19:24 ` [PATCH v2 2/2] replaced test -f and test ! -f krush11 via GitGitGadget 1 sibling, 0 replies; 6+ messages in thread From: krush11 via GitGitGadget @ 2021-03-19 19:24 UTC (permalink / raw) To: git; +Cc: Krushnal Patel, krush11 From: krush11 <krushnalpatel11@gmail.com> Although has the same functionality as test_path_is_file(), in the case where test_path_is_file() fails, we get much better debugging information. Replace with test_path_is_file so that future developers will have a better experience debugging these test cases. Signed-off-by: Krushnal Patel <krushnalpatel11@gmail.com> --- t/t7300-clean.sh | 276 +++++++++++++++++++++++------------------------ 1 file changed, 138 insertions(+), 138 deletions(-) diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index a74816ca8b46..a599c4210085 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -28,15 +28,15 @@ test_expect_success 'git clean with skip-worktree .gitignore' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean && - test -f Makefile && - test -f README && - test -f src/part1.c && - test -f src/part2.c && + test_path_is_file Makefile && + test_path_is_file README && + test_path_is_file src/part1.c && + test_path_is_file src/part2.c && test ! -f a.out && test ! -f src/part3.c && - test -f docs/manual.txt && - test -f obj.o && - test -f build/lib.so && + test_path_is_file docs/manual.txt && + test_path_is_file obj.o && + test_path_is_file build/lib.so && git update-index --no-skip-worktree .gitignore && git checkout .gitignore ' @@ -46,15 +46,15 @@ test_expect_success 'git clean' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean && - test -f Makefile && - test -f README && - test -f src/part1.c && - test -f src/part2.c && + test_path_is_file Makefile && + test_path_is_file README && + test_path_is_file src/part1.c && + test_path_is_file src/part2.c && test ! -f a.out && test ! -f src/part3.c && - test -f docs/manual.txt && - test -f obj.o && - test -f build/lib.so + test_path_is_file docs/manual.txt && + test_path_is_file obj.o && + test_path_is_file build/lib.so ' @@ -63,15 +63,15 @@ test_expect_success 'git clean src/' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean src/ && - test -f Makefile && - test -f README && - test -f src/part1.c && - test -f src/part2.c && - test -f a.out && + test_path_is_file Makefile && + test_path_is_file README && + test_path_is_file src/part1.c && + test_path_is_file src/part2.c && + test_path_is_file a.out && test ! -f src/part3.c && - test -f docs/manual.txt && - test -f obj.o && - test -f build/lib.so + test_path_is_file docs/manual.txt && + test_path_is_file obj.o && + test_path_is_file build/lib.so ' @@ -80,15 +80,15 @@ test_expect_success 'git clean src/ src/' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean src/ src/ && - test -f Makefile && - test -f README && - test -f src/part1.c && - test -f src/part2.c && - test -f a.out && + test_path_is_file Makefile && + test_path_is_file README && + test_path_is_file src/part1.c && + test_path_is_file src/part2.c && + test_path_is_file a.out && test ! -f src/part3.c && - test -f docs/manual.txt && - test -f obj.o && - test -f build/lib.so + test_path_is_file docs/manual.txt && + test_path_is_file obj.o && + test_path_is_file build/lib.so ' @@ -97,16 +97,16 @@ test_expect_success 'git clean with prefix' ' mkdir -p build docs src/test && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so src/test/1.c && (cd src/ && git clean) && - test -f Makefile && - test -f README && - test -f src/part1.c && - test -f src/part2.c && - test -f a.out && + test_path_is_file Makefile && + test_path_is_file README && + test_path_is_file src/part1.c && + test_path_is_file src/part2.c && + test_path_is_file a.out && test ! -f src/part3.c && - test -f src/test/1.c && - test -f docs/manual.txt && - test -f obj.o && - test -f build/lib.so + test_path_is_file src/test/1.c && + test_path_is_file docs/manual.txt && + test_path_is_file obj.o && + test_path_is_file build/lib.so ' @@ -162,16 +162,16 @@ test_expect_success 'git clean -d with prefix and path' ' mkdir -p build docs src/feature && touch a.out src/part3.c src/feature/file.c docs/manual.txt obj.o build/lib.so && (cd src/ && git clean -d feature/) && - test -f Makefile && - test -f README && - test -f src/part1.c && - test -f src/part2.c && - test -f a.out && - test -f src/part3.c && + test_path_is_file Makefile && + test_path_is_file README && + test_path_is_file src/part1.c && + test_path_is_file src/part2.c && + test_path_is_file a.out && + test_path_is_file src/part3.c && test ! -f src/feature/file.c && - test -f docs/manual.txt && - test -f obj.o && - test -f build/lib.so + test_path_is_file docs/manual.txt && + test_path_is_file obj.o && + test_path_is_file build/lib.so ' @@ -181,16 +181,16 @@ test_expect_success SYMLINKS 'git clean symbolic link' ' touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && ln -s docs/manual.txt src/part4.c && git clean && - test -f Makefile && - test -f README && - test -f src/part1.c && - test -f src/part2.c && + test_path_is_file Makefile && + test_path_is_file README && + test_path_is_file src/part1.c && + test_path_is_file src/part2.c && test ! -f a.out && test ! -f src/part3.c && test ! -f src/part4.c && - test -f docs/manual.txt && - test -f obj.o && - test -f build/lib.so + test_path_is_file docs/manual.txt && + test_path_is_file obj.o && + test_path_is_file build/lib.so ' @@ -198,13 +198,13 @@ test_expect_success 'git clean with wildcard' ' touch a.clean b.clean other.c && git clean "*.clean" && - test -f Makefile && - test -f README && - test -f src/part1.c && - test -f src/part2.c && + test_path_is_file Makefile && + test_path_is_file README && + test_path_is_file src/part1.c && + test_path_is_file src/part2.c && test ! -f a.clean && test ! -f b.clean && - test -f other.c + test_path_is_file other.c ' @@ -213,15 +213,15 @@ test_expect_success 'git clean -n' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean -n && - test -f Makefile && - test -f README && - test -f src/part1.c && - test -f src/part2.c && - test -f a.out && - test -f src/part3.c && - test -f docs/manual.txt && - test -f obj.o && - test -f build/lib.so + test_path_is_file Makefile && + test_path_is_file README && + test_path_is_file src/part1.c && + test_path_is_file src/part2.c && + test_path_is_file a.out && + test_path_is_file src/part3.c && + test_path_is_file docs/manual.txt && + test_path_is_file obj.o && + test_path_is_file build/lib.so ' @@ -230,15 +230,15 @@ test_expect_success 'git clean -d' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean -d && - test -f Makefile && - test -f README && - test -f src/part1.c && - test -f src/part2.c && + test_path_is_file Makefile && + test_path_is_file README && + test_path_is_file src/part1.c && + test_path_is_file src/part2.c && test ! -f a.out && test ! -f src/part3.c && test ! -d docs && - test -f obj.o && - test -f build/lib.so + test_path_is_file obj.o && + test_path_is_file build/lib.so ' @@ -247,16 +247,16 @@ test_expect_success 'git clean -d src/ examples/' ' mkdir -p build docs examples && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so examples/1.c && git clean -d src/ examples/ && - test -f Makefile && - test -f README && - test -f src/part1.c && - test -f src/part2.c && - test -f a.out && + test_path_is_file Makefile && + test_path_is_file README && + test_path_is_file src/part1.c && + test_path_is_file src/part2.c && + test_path_is_file a.out && test ! -f src/part3.c && test ! -f examples/1.c && - test -f docs/manual.txt && - test -f obj.o && - test -f build/lib.so + test_path_is_file docs/manual.txt && + test_path_is_file obj.o && + test_path_is_file build/lib.so ' @@ -265,15 +265,15 @@ test_expect_success 'git clean -x' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean -x && - test -f Makefile && - test -f README && - test -f src/part1.c && - test -f src/part2.c && + test_path_is_file Makefile && + test_path_is_file README && + test_path_is_file src/part1.c && + test_path_is_file src/part2.c && test ! -f a.out && test ! -f src/part3.c && - test -f docs/manual.txt && + test_path_is_file docs/manual.txt && test ! -f obj.o && - test -f build/lib.so + test_path_is_file build/lib.so ' @@ -282,10 +282,10 @@ test_expect_success 'git clean -d -x' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean -d -x && - test -f Makefile && - test -f README && - test -f src/part1.c && - test -f src/part2.c && + test_path_is_file Makefile && + test_path_is_file README && + test_path_is_file src/part1.c && + test_path_is_file src/part2.c && test ! -f a.out && test ! -f src/part3.c && test ! -d docs && @@ -299,12 +299,12 @@ test_expect_success 'git clean -d -x with ignored tracked directory' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean -d -x -e src && - test -f Makefile && - test -f README && - test -f src/part1.c && - test -f src/part2.c && + test_path_is_file Makefile && + test_path_is_file README && + test_path_is_file src/part1.c && + test_path_is_file src/part2.c && test ! -f a.out && - test -f src/part3.c && + test_path_is_file src/part3.c && test ! -d docs && test ! -f obj.o && test ! -d build @@ -316,15 +316,15 @@ test_expect_success 'git clean -X' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean -X && - test -f Makefile && - test -f README && - test -f src/part1.c && - test -f src/part2.c && - test -f a.out && - test -f src/part3.c && - test -f docs/manual.txt && + test_path_is_file Makefile && + test_path_is_file README && + test_path_is_file src/part1.c && + test_path_is_file src/part2.c && + test_path_is_file a.out && + test_path_is_file src/part3.c && + test_path_is_file docs/manual.txt && test ! -f obj.o && - test -f build/lib.so + test_path_is_file build/lib.so ' @@ -333,13 +333,13 @@ test_expect_success 'git clean -d -X' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean -d -X && - test -f Makefile && - test -f README && - test -f src/part1.c && - test -f src/part2.c && - test -f a.out && - test -f src/part3.c && - test -f docs/manual.txt && + test_path_is_file Makefile && + test_path_is_file README && + test_path_is_file src/part1.c && + test_path_is_file src/part2.c && + test_path_is_file a.out && + test_path_is_file src/part3.c && + test_path_is_file docs/manual.txt && test ! -f obj.o && test ! -d build @@ -350,13 +350,13 @@ test_expect_success 'git clean -d -X with ignored tracked directory' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean -d -X -e src && - test -f Makefile && - test -f README && - test -f src/part1.c && - test -f src/part2.c && - test -f a.out && + test_path_is_file Makefile && + test_path_is_file README && + test_path_is_file src/part1.c && + test_path_is_file src/part2.c && + test_path_is_file a.out && test ! -f src/part3.c && - test -f docs/manual.txt && + test_path_is_file docs/manual.txt && test ! -f obj.o && test ! -d build @@ -381,29 +381,29 @@ test_expect_success 'clean.requireForce and -n' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean -n && - test -f Makefile && - test -f README && - test -f src/part1.c && - test -f src/part2.c && - test -f a.out && - test -f src/part3.c && - test -f docs/manual.txt && - test -f obj.o && - test -f build/lib.so + test_path_is_file Makefile && + test_path_is_file README && + test_path_is_file src/part1.c && + test_path_is_file src/part2.c && + test_path_is_file a.out && + test_path_is_file src/part3.c && + test_path_is_file docs/manual.txt && + test_path_is_file obj.o && + test_path_is_file build/lib.so ' test_expect_success 'clean.requireForce and -f' ' git clean -f && - test -f README && - test -f src/part1.c && - test -f src/part2.c && + test_path_is_file README && + test_path_is_file src/part1.c && + test_path_is_file src/part2.c && test ! -f a.out && test ! -f src/part3.c && - test -f docs/manual.txt && - test -f obj.o && - test -f build/lib.so + test_path_is_file docs/manual.txt && + test_path_is_file obj.o && + test_path_is_file build/lib.so ' @@ -446,10 +446,10 @@ test_expect_success 'nested git work tree' ' test_commit deeply.nested deeper.world ) && git clean -f -d && - test -f foo/.git/index && - test -f foo/hello.world && - test -f baz/boo/.git/index && - test -f baz/boo/deeper.world && + test_path_is_file foo/.git/index && + test_path_is_file foo/hello.world && + test_path_is_file baz/boo/.git/index && + test_path_is_file baz/boo/deeper.world && ! test -d bar ' -- gitgitgadget ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] replaced test -f and test ! -f 2021-03-19 19:24 ` [PATCH v2 0/2] " Krushnal Patel via GitGitGadget 2021-03-19 19:24 ` [PATCH v2 1/2] " krush11 via GitGitGadget @ 2021-03-19 19:24 ` krush11 via GitGitGadget 2021-03-19 20:34 ` Junio C Hamano 1 sibling, 1 reply; 6+ messages in thread From: krush11 via GitGitGadget @ 2021-03-19 19:24 UTC (permalink / raw) To: git; +Cc: Krushnal Patel, krush11 From: krush11 <krushnalpatel11@gmail.com> test -f relates to 'must exist as a file' and similarly, test ! -f relates to 'must not exist as a file'. So, test -f can be replaced with test_path_exists and test ! -f can be replaced by test_path_is_missing. Signed-off-by: Krushnal Patel <krushnalpatel11@gmail.com> --- t/t7300-clean.sh | 376 +++++++++++++++++++++++------------------------ 1 file changed, 188 insertions(+), 188 deletions(-) diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index a599c4210085..d1777ff084e6 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -28,15 +28,15 @@ test_expect_success 'git clean with skip-worktree .gitignore' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean && - test_path_is_file Makefile && - test_path_is_file README && - test_path_is_file src/part1.c && - test_path_is_file src/part2.c && - test ! -f a.out && - test ! -f src/part3.c && - test_path_is_file docs/manual.txt && - test_path_is_file obj.o && - test_path_is_file build/lib.so && + test_path_exists Makefile && + test_path_exists README && + test_path_exists src/part1.c && + test_path_exists src/part2.c && + test_path_is_missing a.out && + test_path_is_missing src/part3.c && + test_path_exists docs/manual.txt && + test_path_exists obj.o && + test_path_exists build/lib.so && git update-index --no-skip-worktree .gitignore && git checkout .gitignore ' @@ -46,15 +46,15 @@ test_expect_success 'git clean' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean && - test_path_is_file Makefile && - test_path_is_file README && - test_path_is_file src/part1.c && - test_path_is_file src/part2.c && - test ! -f a.out && - test ! -f src/part3.c && - test_path_is_file docs/manual.txt && - test_path_is_file obj.o && - test_path_is_file build/lib.so + test_path_exists Makefile && + test_path_exists README && + test_path_exists src/part1.c && + test_path_exists src/part2.c && + test_path_is_missing a.out && + test_path_is_missing src/part3.c && + test_path_exists docs/manual.txt && + test_path_exists obj.o && + test_path_exists build/lib.so ' @@ -63,15 +63,15 @@ test_expect_success 'git clean src/' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean src/ && - test_path_is_file Makefile && - test_path_is_file README && - test_path_is_file src/part1.c && - test_path_is_file src/part2.c && - test_path_is_file a.out && - test ! -f src/part3.c && - test_path_is_file docs/manual.txt && - test_path_is_file obj.o && - test_path_is_file build/lib.so + test_path_exists Makefile && + test_path_exists README && + test_path_exists src/part1.c && + test_path_exists src/part2.c && + test_path_exists a.out && + test_path_is_missing src/part3.c && + test_path_exists docs/manual.txt && + test_path_exists obj.o && + test_path_exists build/lib.so ' @@ -80,15 +80,15 @@ test_expect_success 'git clean src/ src/' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean src/ src/ && - test_path_is_file Makefile && - test_path_is_file README && - test_path_is_file src/part1.c && - test_path_is_file src/part2.c && - test_path_is_file a.out && - test ! -f src/part3.c && - test_path_is_file docs/manual.txt && - test_path_is_file obj.o && - test_path_is_file build/lib.so + test_path_exists Makefile && + test_path_exists README && + test_path_exists src/part1.c && + test_path_exists src/part2.c && + test_path_exists a.out && + test_path_is_missing src/part3.c && + test_path_exists docs/manual.txt && + test_path_exists obj.o && + test_path_exists build/lib.so ' @@ -97,16 +97,16 @@ test_expect_success 'git clean with prefix' ' mkdir -p build docs src/test && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so src/test/1.c && (cd src/ && git clean) && - test_path_is_file Makefile && - test_path_is_file README && - test_path_is_file src/part1.c && - test_path_is_file src/part2.c && - test_path_is_file a.out && - test ! -f src/part3.c && - test_path_is_file src/test/1.c && - test_path_is_file docs/manual.txt && - test_path_is_file obj.o && - test_path_is_file build/lib.so + test_path_exists Makefile && + test_path_exists README && + test_path_exists src/part1.c && + test_path_exists src/part2.c && + test_path_exists a.out && + test_path_is_missing src/part3.c && + test_path_exists src/test/1.c && + test_path_exists docs/manual.txt && + test_path_exists obj.o && + test_path_exists build/lib.so ' @@ -162,16 +162,16 @@ test_expect_success 'git clean -d with prefix and path' ' mkdir -p build docs src/feature && touch a.out src/part3.c src/feature/file.c docs/manual.txt obj.o build/lib.so && (cd src/ && git clean -d feature/) && - test_path_is_file Makefile && - test_path_is_file README && - test_path_is_file src/part1.c && - test_path_is_file src/part2.c && - test_path_is_file a.out && - test_path_is_file src/part3.c && - test ! -f src/feature/file.c && - test_path_is_file docs/manual.txt && - test_path_is_file obj.o && - test_path_is_file build/lib.so + test_path_exists Makefile && + test_path_exists README && + test_path_exists src/part1.c && + test_path_exists src/part2.c && + test_path_exists a.out && + test_path_exists src/part3.c && + test_path_is_missing src/feature/file.c && + test_path_exists docs/manual.txt && + test_path_exists obj.o && + test_path_exists build/lib.so ' @@ -181,16 +181,16 @@ test_expect_success SYMLINKS 'git clean symbolic link' ' touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && ln -s docs/manual.txt src/part4.c && git clean && - test_path_is_file Makefile && - test_path_is_file README && - test_path_is_file src/part1.c && - test_path_is_file src/part2.c && - test ! -f a.out && - test ! -f src/part3.c && - test ! -f src/part4.c && - test_path_is_file docs/manual.txt && - test_path_is_file obj.o && - test_path_is_file build/lib.so + test_path_exists Makefile && + test_path_exists README && + test_path_exists src/part1.c && + test_path_exists src/part2.c && + test_path_is_missing a.out && + test_path_is_missing src/part3.c && + test_path_is_missing src/part4.c && + test_path_exists docs/manual.txt && + test_path_exists obj.o && + test_path_exists build/lib.so ' @@ -198,13 +198,13 @@ test_expect_success 'git clean with wildcard' ' touch a.clean b.clean other.c && git clean "*.clean" && - test_path_is_file Makefile && - test_path_is_file README && - test_path_is_file src/part1.c && - test_path_is_file src/part2.c && - test ! -f a.clean && - test ! -f b.clean && - test_path_is_file other.c + test_path_exists Makefile && + test_path_exists README && + test_path_exists src/part1.c && + test_path_exists src/part2.c && + test_path_is_missing a.clean && + test_path_is_missing b.clean && + test_path_exists other.c ' @@ -213,15 +213,15 @@ test_expect_success 'git clean -n' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean -n && - test_path_is_file Makefile && - test_path_is_file README && - test_path_is_file src/part1.c && - test_path_is_file src/part2.c && - test_path_is_file a.out && - test_path_is_file src/part3.c && - test_path_is_file docs/manual.txt && - test_path_is_file obj.o && - test_path_is_file build/lib.so + test_path_exists Makefile && + test_path_exists README && + test_path_exists src/part1.c && + test_path_exists src/part2.c && + test_path_exists a.out && + test_path_exists src/part3.c && + test_path_exists docs/manual.txt && + test_path_exists obj.o && + test_path_exists build/lib.so ' @@ -230,15 +230,15 @@ test_expect_success 'git clean -d' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean -d && - test_path_is_file Makefile && - test_path_is_file README && - test_path_is_file src/part1.c && - test_path_is_file src/part2.c && - test ! -f a.out && - test ! -f src/part3.c && + test_path_exists Makefile && + test_path_exists README && + test_path_exists src/part1.c && + test_path_exists src/part2.c && + test_path_is_missing a.out && + test_path_is_missing src/part3.c && test ! -d docs && - test_path_is_file obj.o && - test_path_is_file build/lib.so + test_path_exists obj.o && + test_path_exists build/lib.so ' @@ -247,16 +247,16 @@ test_expect_success 'git clean -d src/ examples/' ' mkdir -p build docs examples && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so examples/1.c && git clean -d src/ examples/ && - test_path_is_file Makefile && - test_path_is_file README && - test_path_is_file src/part1.c && - test_path_is_file src/part2.c && - test_path_is_file a.out && - test ! -f src/part3.c && - test ! -f examples/1.c && - test_path_is_file docs/manual.txt && - test_path_is_file obj.o && - test_path_is_file build/lib.so + test_path_exists Makefile && + test_path_exists README && + test_path_exists src/part1.c && + test_path_exists src/part2.c && + test_path_exists a.out && + test_path_is_missing src/part3.c && + test_path_is_missing examples/1.c && + test_path_exists docs/manual.txt && + test_path_exists obj.o && + test_path_exists build/lib.so ' @@ -265,15 +265,15 @@ test_expect_success 'git clean -x' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean -x && - test_path_is_file Makefile && - test_path_is_file README && - test_path_is_file src/part1.c && - test_path_is_file src/part2.c && - test ! -f a.out && - test ! -f src/part3.c && - test_path_is_file docs/manual.txt && - test ! -f obj.o && - test_path_is_file build/lib.so + test_path_exists Makefile && + test_path_exists README && + test_path_exists src/part1.c && + test_path_exists src/part2.c && + test_path_is_missing a.out && + test_path_is_missing src/part3.c && + test_path_exists docs/manual.txt && + test_path_is_missing obj.o && + test_path_exists build/lib.so ' @@ -282,14 +282,14 @@ test_expect_success 'git clean -d -x' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean -d -x && - test_path_is_file Makefile && - test_path_is_file README && - test_path_is_file src/part1.c && - test_path_is_file src/part2.c && - test ! -f a.out && - test ! -f src/part3.c && + test_path_exists Makefile && + test_path_exists README && + test_path_exists src/part1.c && + test_path_exists src/part2.c && + test_path_is_missing a.out && + test_path_is_missing src/part3.c && test ! -d docs && - test ! -f obj.o && + test_path_is_missing obj.o && test ! -d build ' @@ -299,14 +299,14 @@ test_expect_success 'git clean -d -x with ignored tracked directory' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean -d -x -e src && - test_path_is_file Makefile && - test_path_is_file README && - test_path_is_file src/part1.c && - test_path_is_file src/part2.c && - test ! -f a.out && - test_path_is_file src/part3.c && + test_path_exists Makefile && + test_path_exists README && + test_path_exists src/part1.c && + test_path_exists src/part2.c && + test_path_is_missing a.out && + test_path_exists src/part3.c && test ! -d docs && - test ! -f obj.o && + test_path_is_missing obj.o && test ! -d build ' @@ -316,15 +316,15 @@ test_expect_success 'git clean -X' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean -X && - test_path_is_file Makefile && - test_path_is_file README && - test_path_is_file src/part1.c && - test_path_is_file src/part2.c && - test_path_is_file a.out && - test_path_is_file src/part3.c && - test_path_is_file docs/manual.txt && - test ! -f obj.o && - test_path_is_file build/lib.so + test_path_exists Makefile && + test_path_exists README && + test_path_exists src/part1.c && + test_path_exists src/part2.c && + test_path_exists a.out && + test_path_exists src/part3.c && + test_path_exists docs/manual.txt && + test_path_is_missing obj.o && + test_path_exists build/lib.so ' @@ -333,14 +333,14 @@ test_expect_success 'git clean -d -X' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean -d -X && - test_path_is_file Makefile && - test_path_is_file README && - test_path_is_file src/part1.c && - test_path_is_file src/part2.c && - test_path_is_file a.out && - test_path_is_file src/part3.c && - test_path_is_file docs/manual.txt && - test ! -f obj.o && + test_path_exists Makefile && + test_path_exists README && + test_path_exists src/part1.c && + test_path_exists src/part2.c && + test_path_exists a.out && + test_path_exists src/part3.c && + test_path_exists docs/manual.txt && + test_path_is_missing obj.o && test ! -d build ' @@ -350,14 +350,14 @@ test_expect_success 'git clean -d -X with ignored tracked directory' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean -d -X -e src && - test_path_is_file Makefile && - test_path_is_file README && - test_path_is_file src/part1.c && - test_path_is_file src/part2.c && - test_path_is_file a.out && - test ! -f src/part3.c && - test_path_is_file docs/manual.txt && - test ! -f obj.o && + test_path_exists Makefile && + test_path_exists README && + test_path_exists src/part1.c && + test_path_exists src/part2.c && + test_path_exists a.out && + test_path_is_missing src/part3.c && + test_path_exists docs/manual.txt && + test_path_is_missing obj.o && test ! -d build ' @@ -381,29 +381,29 @@ test_expect_success 'clean.requireForce and -n' ' mkdir -p build docs && touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && git clean -n && - test_path_is_file Makefile && - test_path_is_file README && - test_path_is_file src/part1.c && - test_path_is_file src/part2.c && - test_path_is_file a.out && - test_path_is_file src/part3.c && - test_path_is_file docs/manual.txt && - test_path_is_file obj.o && - test_path_is_file build/lib.so + test_path_exists Makefile && + test_path_exists README && + test_path_exists src/part1.c && + test_path_exists src/part2.c && + test_path_exists a.out && + test_path_exists src/part3.c && + test_path_exists docs/manual.txt && + test_path_exists obj.o && + test_path_exists build/lib.so ' test_expect_success 'clean.requireForce and -f' ' git clean -f && - test_path_is_file README && - test_path_is_file src/part1.c && - test_path_is_file src/part2.c && - test ! -f a.out && - test ! -f src/part3.c && - test_path_is_file docs/manual.txt && - test_path_is_file obj.o && - test_path_is_file build/lib.so + test_path_exists README && + test_path_exists src/part1.c && + test_path_exists src/part2.c && + test_path_is_missing a.out && + test_path_is_missing src/part3.c && + test_path_exists docs/manual.txt && + test_path_exists obj.o && + test_path_exists build/lib.so ' @@ -446,10 +446,10 @@ test_expect_success 'nested git work tree' ' test_commit deeply.nested deeper.world ) && git clean -f -d && - test_path_is_file foo/.git/index && - test_path_is_file foo/hello.world && - test_path_is_file baz/boo/.git/index && - test_path_is_file baz/boo/deeper.world && + test_path_exists foo/.git/index && + test_path_exists foo/hello.world && + test_path_exists baz/boo/.git/index && + test_path_exists baz/boo/deeper.world && ! test -d bar ' @@ -488,12 +488,12 @@ test_expect_success 'should not clean submodules' ' git checkout before_sub2 && >to_clean/should_clean.this && git clean -f -d && - test_path_is_file repo/.git/index && - test_path_is_file repo/hello.world && - test_path_is_file sub1/.git && - test_path_is_file sub1/hello.world && - test_path_is_file sub2/.git && - test_path_is_file sub2/hello.world && + test_path_exists repo/.git/index && + test_path_exists repo/hello.world && + test_path_exists sub1/.git && + test_path_exists sub1/hello.world && + test_path_exists sub2/.git && + test_path_exists sub2/hello.world && test_path_is_missing to_clean ' @@ -506,8 +506,8 @@ test_expect_success POSIXPERM,SANITY 'should avoid cleaning possible submodules' chmod 0 possible_sub1/.git && >to_clean/should_clean.this && git clean -f -d && - test_path_is_file possible_sub1/.git && - test_path_is_file possible_sub1/hello.world && + test_path_exists possible_sub1/.git && + test_path_exists possible_sub1/hello.world && test_path_is_missing to_clean ' @@ -517,7 +517,7 @@ test_expect_success 'nested (empty) git should be kept' ' mkdir to_clean && >to_clean/should_clean.this && git clean -f -d && - test_path_is_file empty_repo/.git/HEAD && + test_path_exists empty_repo/.git/HEAD && test_path_is_missing to_clean ' @@ -559,9 +559,9 @@ test_expect_success 'giving path in nested git work tree will NOT remove it' ' test_commit msg bar/baz/hello.world ) && git clean -f -d repo/bar/baz && - test_path_is_file repo/.git/HEAD && + test_path_exists repo/.git/HEAD && test_path_is_dir repo/bar/ && - test_path_is_file repo/bar/baz/hello.world + test_path_exists repo/bar/baz/hello.world ' test_expect_success 'giving path to nested .git will not remove it' ' @@ -573,7 +573,7 @@ test_expect_success 'giving path to nested .git will not remove it' ' test_commit msg hello.world ) && git clean -f -d repo/.git && - test_path_is_file repo/.git/HEAD && + test_path_exists repo/.git/HEAD && test_path_is_dir repo/.git/refs && test_path_is_dir repo/.git/objects && test_path_is_dir untracked/ @@ -589,7 +589,7 @@ test_expect_success 'giving path to nested .git/ will NOT remove contents' ' ) && git clean -f -d repo/.git/ && test_path_is_dir repo/.git && - test_path_is_file repo/.git/HEAD && + test_path_exists repo/.git/HEAD && test_path_is_dir untracked/ ' @@ -663,11 +663,11 @@ test_expect_success 'git clean -d skips untracked dirs containing ignored files' touch foo/bar foo/baz foo/a/aa/ignoreme foo/b/ignoreme foo/b/bb/1 foo/b/bb/2 && git clean -df && test_path_is_dir foo && - test_path_is_file foo/bar && + test_path_exists foo/bar && test_path_is_missing foo/baz && - test_path_is_file foo/a/aa/ignoreme && + test_path_exists foo/a/aa/ignoreme && test_path_is_missing foo/a/aa/aaa && - test_path_is_file foo/b/ignoreme && + test_path_exists foo/b/ignoreme && test_path_is_missing foo/b/bb ' @@ -688,9 +688,9 @@ test_expect_success 'git clean -d skips nested repo containing ignored files' ' git clean -fd && - test_path_is_file nested-repo-with-ignored-file/.git/index && - test_path_is_file nested-repo-with-ignored-file/ignoreme && - test_path_is_file nested-repo-with-ignored-file/file + test_path_exists nested-repo-with-ignored-file/.git/index && + test_path_exists nested-repo-with-ignored-file/ignoreme && + test_path_exists nested-repo-with-ignored-file/file ' test_expect_success 'git clean handles being told what to clean' ' -- gitgitgadget ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] replaced test -f and test ! -f 2021-03-19 19:24 ` [PATCH v2 2/2] replaced test -f and test ! -f krush11 via GitGitGadget @ 2021-03-19 20:34 ` Junio C Hamano 0 siblings, 0 replies; 6+ messages in thread From: Junio C Hamano @ 2021-03-19 20:34 UTC (permalink / raw) To: krush11 via GitGitGadget; +Cc: git, Krushnal Patel "krush11 via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: krush11 <krushnalpatel11@gmail.com> > > test -f relates to 'must exist as a file' and similarly, > test ! -f relates to 'must not exist as a file'. > So, test -f can be replaced with test_path_exists and test ! -f can be replaced by test_path_is_missing. > > Signed-off-by: Krushnal Patel <krushnalpatel11@gmail.com> > --- > t/t7300-clean.sh | 376 +++++++++++++++++++++++------------------------ > 1 file changed, 188 insertions(+), 188 deletions(-) A few comments. * Your "From:" authorship and "Signed-off-by:" authorship should match. As Documentation/SubmittingPatches states, we require real name for sign-off, you'd need to correct the "From:" side. * I do not think it makes sense for this topic to be two-patch series. We do nto want to first go from "test -f" to "test_path_is_file" and then to "test_path_exists", while doing nothing to "! test -f" in the first step and later to "missing". Perhaps squash them into a single patch with an updated message and force push before re-submitting the GitHub PR? * The rationale given for this step does not make much sense. The first two sentences are not wrong per-se, but we should make it clear that we are NOT claiming that "test -f" is used for "must not be missing" in general. E.g. The tests in this script use "test -f" when it wants to make sure a path that "git clean" should not remove is still there, and "! test -f" (or "test ! -f") when it wants to make sure a path that should be removed is indeed gone. Replace them with test_path_exists and test_path_is_missing to clarify the expectation. It also makes any failed expectation stand out and easier to spot to se these test helpers. or something like that, perhaps. Thanks. > diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh > index a599c4210085..d1777ff084e6 100755 > --- a/t/t7300-clean.sh > +++ b/t/t7300-clean.sh > @@ -28,15 +28,15 @@ test_expect_success 'git clean with skip-worktree .gitignore' ' > mkdir -p build docs && > touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && > git clean && > - test_path_is_file Makefile && > - test_path_is_file README && > - test_path_is_file src/part1.c && > - test_path_is_file src/part2.c && > - test ! -f a.out && > - test ! -f src/part3.c && > - test_path_is_file docs/manual.txt && > - test_path_is_file obj.o && > - test_path_is_file build/lib.so && > + test_path_exists Makefile && > + test_path_exists README && > + test_path_exists src/part1.c && > + test_path_exists src/part2.c && > + test_path_is_missing a.out && > + test_path_is_missing src/part3.c && > + test_path_exists docs/manual.txt && > + test_path_exists obj.o && > + test_path_exists build/lib.so && > git update-index --no-skip-worktree .gitignore && > git checkout .gitignore > ' > @@ -46,15 +46,15 @@ test_expect_success 'git clean' ' > mkdir -p build docs && > touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && > git clean && > - test_path_is_file Makefile && > - test_path_is_file README && > - test_path_is_file src/part1.c && > - test_path_is_file src/part2.c && > - test ! -f a.out && > - test ! -f src/part3.c && > - test_path_is_file docs/manual.txt && > - test_path_is_file obj.o && > - test_path_is_file build/lib.so > + test_path_exists Makefile && > + test_path_exists README && > + test_path_exists src/part1.c && > + test_path_exists src/part2.c && > + test_path_is_missing a.out && > + test_path_is_missing src/part3.c && > + test_path_exists docs/manual.txt && > + test_path_exists obj.o && > + test_path_exists build/lib.so > > ' > > @@ -63,15 +63,15 @@ test_expect_success 'git clean src/' ' > mkdir -p build docs && > touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && > git clean src/ && > - test_path_is_file Makefile && > - test_path_is_file README && > - test_path_is_file src/part1.c && > - test_path_is_file src/part2.c && > - test_path_is_file a.out && > - test ! -f src/part3.c && > - test_path_is_file docs/manual.txt && > - test_path_is_file obj.o && > - test_path_is_file build/lib.so > + test_path_exists Makefile && > + test_path_exists README && > + test_path_exists src/part1.c && > + test_path_exists src/part2.c && > + test_path_exists a.out && > + test_path_is_missing src/part3.c && > + test_path_exists docs/manual.txt && > + test_path_exists obj.o && > + test_path_exists build/lib.so > > ' > > @@ -80,15 +80,15 @@ test_expect_success 'git clean src/ src/' ' > mkdir -p build docs && > touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && > git clean src/ src/ && > - test_path_is_file Makefile && > - test_path_is_file README && > - test_path_is_file src/part1.c && > - test_path_is_file src/part2.c && > - test_path_is_file a.out && > - test ! -f src/part3.c && > - test_path_is_file docs/manual.txt && > - test_path_is_file obj.o && > - test_path_is_file build/lib.so > + test_path_exists Makefile && > + test_path_exists README && > + test_path_exists src/part1.c && > + test_path_exists src/part2.c && > + test_path_exists a.out && > + test_path_is_missing src/part3.c && > + test_path_exists docs/manual.txt && > + test_path_exists obj.o && > + test_path_exists build/lib.so > > ' > > @@ -97,16 +97,16 @@ test_expect_success 'git clean with prefix' ' > mkdir -p build docs src/test && > touch a.out src/part3.c docs/manual.txt obj.o build/lib.so src/test/1.c && > (cd src/ && git clean) && > - test_path_is_file Makefile && > - test_path_is_file README && > - test_path_is_file src/part1.c && > - test_path_is_file src/part2.c && > - test_path_is_file a.out && > - test ! -f src/part3.c && > - test_path_is_file src/test/1.c && > - test_path_is_file docs/manual.txt && > - test_path_is_file obj.o && > - test_path_is_file build/lib.so > + test_path_exists Makefile && > + test_path_exists README && > + test_path_exists src/part1.c && > + test_path_exists src/part2.c && > + test_path_exists a.out && > + test_path_is_missing src/part3.c && > + test_path_exists src/test/1.c && > + test_path_exists docs/manual.txt && > + test_path_exists obj.o && > + test_path_exists build/lib.so > > ' > > @@ -162,16 +162,16 @@ test_expect_success 'git clean -d with prefix and path' ' > mkdir -p build docs src/feature && > touch a.out src/part3.c src/feature/file.c docs/manual.txt obj.o build/lib.so && > (cd src/ && git clean -d feature/) && > - test_path_is_file Makefile && > - test_path_is_file README && > - test_path_is_file src/part1.c && > - test_path_is_file src/part2.c && > - test_path_is_file a.out && > - test_path_is_file src/part3.c && > - test ! -f src/feature/file.c && > - test_path_is_file docs/manual.txt && > - test_path_is_file obj.o && > - test_path_is_file build/lib.so > + test_path_exists Makefile && > + test_path_exists README && > + test_path_exists src/part1.c && > + test_path_exists src/part2.c && > + test_path_exists a.out && > + test_path_exists src/part3.c && > + test_path_is_missing src/feature/file.c && > + test_path_exists docs/manual.txt && > + test_path_exists obj.o && > + test_path_exists build/lib.so > > ' > > @@ -181,16 +181,16 @@ test_expect_success SYMLINKS 'git clean symbolic link' ' > touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && > ln -s docs/manual.txt src/part4.c && > git clean && > - test_path_is_file Makefile && > - test_path_is_file README && > - test_path_is_file src/part1.c && > - test_path_is_file src/part2.c && > - test ! -f a.out && > - test ! -f src/part3.c && > - test ! -f src/part4.c && > - test_path_is_file docs/manual.txt && > - test_path_is_file obj.o && > - test_path_is_file build/lib.so > + test_path_exists Makefile && > + test_path_exists README && > + test_path_exists src/part1.c && > + test_path_exists src/part2.c && > + test_path_is_missing a.out && > + test_path_is_missing src/part3.c && > + test_path_is_missing src/part4.c && > + test_path_exists docs/manual.txt && > + test_path_exists obj.o && > + test_path_exists build/lib.so > > ' > > @@ -198,13 +198,13 @@ test_expect_success 'git clean with wildcard' ' > > touch a.clean b.clean other.c && > git clean "*.clean" && > - test_path_is_file Makefile && > - test_path_is_file README && > - test_path_is_file src/part1.c && > - test_path_is_file src/part2.c && > - test ! -f a.clean && > - test ! -f b.clean && > - test_path_is_file other.c > + test_path_exists Makefile && > + test_path_exists README && > + test_path_exists src/part1.c && > + test_path_exists src/part2.c && > + test_path_is_missing a.clean && > + test_path_is_missing b.clean && > + test_path_exists other.c > > ' > > @@ -213,15 +213,15 @@ test_expect_success 'git clean -n' ' > mkdir -p build docs && > touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && > git clean -n && > - test_path_is_file Makefile && > - test_path_is_file README && > - test_path_is_file src/part1.c && > - test_path_is_file src/part2.c && > - test_path_is_file a.out && > - test_path_is_file src/part3.c && > - test_path_is_file docs/manual.txt && > - test_path_is_file obj.o && > - test_path_is_file build/lib.so > + test_path_exists Makefile && > + test_path_exists README && > + test_path_exists src/part1.c && > + test_path_exists src/part2.c && > + test_path_exists a.out && > + test_path_exists src/part3.c && > + test_path_exists docs/manual.txt && > + test_path_exists obj.o && > + test_path_exists build/lib.so > > ' > > @@ -230,15 +230,15 @@ test_expect_success 'git clean -d' ' > mkdir -p build docs && > touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && > git clean -d && > - test_path_is_file Makefile && > - test_path_is_file README && > - test_path_is_file src/part1.c && > - test_path_is_file src/part2.c && > - test ! -f a.out && > - test ! -f src/part3.c && > + test_path_exists Makefile && > + test_path_exists README && > + test_path_exists src/part1.c && > + test_path_exists src/part2.c && > + test_path_is_missing a.out && > + test_path_is_missing src/part3.c && > test ! -d docs && > - test_path_is_file obj.o && > - test_path_is_file build/lib.so > + test_path_exists obj.o && > + test_path_exists build/lib.so > > ' > > @@ -247,16 +247,16 @@ test_expect_success 'git clean -d src/ examples/' ' > mkdir -p build docs examples && > touch a.out src/part3.c docs/manual.txt obj.o build/lib.so examples/1.c && > git clean -d src/ examples/ && > - test_path_is_file Makefile && > - test_path_is_file README && > - test_path_is_file src/part1.c && > - test_path_is_file src/part2.c && > - test_path_is_file a.out && > - test ! -f src/part3.c && > - test ! -f examples/1.c && > - test_path_is_file docs/manual.txt && > - test_path_is_file obj.o && > - test_path_is_file build/lib.so > + test_path_exists Makefile && > + test_path_exists README && > + test_path_exists src/part1.c && > + test_path_exists src/part2.c && > + test_path_exists a.out && > + test_path_is_missing src/part3.c && > + test_path_is_missing examples/1.c && > + test_path_exists docs/manual.txt && > + test_path_exists obj.o && > + test_path_exists build/lib.so > > ' > > @@ -265,15 +265,15 @@ test_expect_success 'git clean -x' ' > mkdir -p build docs && > touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && > git clean -x && > - test_path_is_file Makefile && > - test_path_is_file README && > - test_path_is_file src/part1.c && > - test_path_is_file src/part2.c && > - test ! -f a.out && > - test ! -f src/part3.c && > - test_path_is_file docs/manual.txt && > - test ! -f obj.o && > - test_path_is_file build/lib.so > + test_path_exists Makefile && > + test_path_exists README && > + test_path_exists src/part1.c && > + test_path_exists src/part2.c && > + test_path_is_missing a.out && > + test_path_is_missing src/part3.c && > + test_path_exists docs/manual.txt && > + test_path_is_missing obj.o && > + test_path_exists build/lib.so > > ' > > @@ -282,14 +282,14 @@ test_expect_success 'git clean -d -x' ' > mkdir -p build docs && > touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && > git clean -d -x && > - test_path_is_file Makefile && > - test_path_is_file README && > - test_path_is_file src/part1.c && > - test_path_is_file src/part2.c && > - test ! -f a.out && > - test ! -f src/part3.c && > + test_path_exists Makefile && > + test_path_exists README && > + test_path_exists src/part1.c && > + test_path_exists src/part2.c && > + test_path_is_missing a.out && > + test_path_is_missing src/part3.c && > test ! -d docs && > - test ! -f obj.o && > + test_path_is_missing obj.o && > test ! -d build > > ' > @@ -299,14 +299,14 @@ test_expect_success 'git clean -d -x with ignored tracked directory' ' > mkdir -p build docs && > touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && > git clean -d -x -e src && > - test_path_is_file Makefile && > - test_path_is_file README && > - test_path_is_file src/part1.c && > - test_path_is_file src/part2.c && > - test ! -f a.out && > - test_path_is_file src/part3.c && > + test_path_exists Makefile && > + test_path_exists README && > + test_path_exists src/part1.c && > + test_path_exists src/part2.c && > + test_path_is_missing a.out && > + test_path_exists src/part3.c && > test ! -d docs && > - test ! -f obj.o && > + test_path_is_missing obj.o && > test ! -d build > > ' > @@ -316,15 +316,15 @@ test_expect_success 'git clean -X' ' > mkdir -p build docs && > touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && > git clean -X && > - test_path_is_file Makefile && > - test_path_is_file README && > - test_path_is_file src/part1.c && > - test_path_is_file src/part2.c && > - test_path_is_file a.out && > - test_path_is_file src/part3.c && > - test_path_is_file docs/manual.txt && > - test ! -f obj.o && > - test_path_is_file build/lib.so > + test_path_exists Makefile && > + test_path_exists README && > + test_path_exists src/part1.c && > + test_path_exists src/part2.c && > + test_path_exists a.out && > + test_path_exists src/part3.c && > + test_path_exists docs/manual.txt && > + test_path_is_missing obj.o && > + test_path_exists build/lib.so > > ' > > @@ -333,14 +333,14 @@ test_expect_success 'git clean -d -X' ' > mkdir -p build docs && > touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && > git clean -d -X && > - test_path_is_file Makefile && > - test_path_is_file README && > - test_path_is_file src/part1.c && > - test_path_is_file src/part2.c && > - test_path_is_file a.out && > - test_path_is_file src/part3.c && > - test_path_is_file docs/manual.txt && > - test ! -f obj.o && > + test_path_exists Makefile && > + test_path_exists README && > + test_path_exists src/part1.c && > + test_path_exists src/part2.c && > + test_path_exists a.out && > + test_path_exists src/part3.c && > + test_path_exists docs/manual.txt && > + test_path_is_missing obj.o && > test ! -d build > > ' > @@ -350,14 +350,14 @@ test_expect_success 'git clean -d -X with ignored tracked directory' ' > mkdir -p build docs && > touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && > git clean -d -X -e src && > - test_path_is_file Makefile && > - test_path_is_file README && > - test_path_is_file src/part1.c && > - test_path_is_file src/part2.c && > - test_path_is_file a.out && > - test ! -f src/part3.c && > - test_path_is_file docs/manual.txt && > - test ! -f obj.o && > + test_path_exists Makefile && > + test_path_exists README && > + test_path_exists src/part1.c && > + test_path_exists src/part2.c && > + test_path_exists a.out && > + test_path_is_missing src/part3.c && > + test_path_exists docs/manual.txt && > + test_path_is_missing obj.o && > test ! -d build > > ' > @@ -381,29 +381,29 @@ test_expect_success 'clean.requireForce and -n' ' > mkdir -p build docs && > touch a.out src/part3.c docs/manual.txt obj.o build/lib.so && > git clean -n && > - test_path_is_file Makefile && > - test_path_is_file README && > - test_path_is_file src/part1.c && > - test_path_is_file src/part2.c && > - test_path_is_file a.out && > - test_path_is_file src/part3.c && > - test_path_is_file docs/manual.txt && > - test_path_is_file obj.o && > - test_path_is_file build/lib.so > + test_path_exists Makefile && > + test_path_exists README && > + test_path_exists src/part1.c && > + test_path_exists src/part2.c && > + test_path_exists a.out && > + test_path_exists src/part3.c && > + test_path_exists docs/manual.txt && > + test_path_exists obj.o && > + test_path_exists build/lib.so > > ' > > test_expect_success 'clean.requireForce and -f' ' > > git clean -f && > - test_path_is_file README && > - test_path_is_file src/part1.c && > - test_path_is_file src/part2.c && > - test ! -f a.out && > - test ! -f src/part3.c && > - test_path_is_file docs/manual.txt && > - test_path_is_file obj.o && > - test_path_is_file build/lib.so > + test_path_exists README && > + test_path_exists src/part1.c && > + test_path_exists src/part2.c && > + test_path_is_missing a.out && > + test_path_is_missing src/part3.c && > + test_path_exists docs/manual.txt && > + test_path_exists obj.o && > + test_path_exists build/lib.so > > ' > > @@ -446,10 +446,10 @@ test_expect_success 'nested git work tree' ' > test_commit deeply.nested deeper.world > ) && > git clean -f -d && > - test_path_is_file foo/.git/index && > - test_path_is_file foo/hello.world && > - test_path_is_file baz/boo/.git/index && > - test_path_is_file baz/boo/deeper.world && > + test_path_exists foo/.git/index && > + test_path_exists foo/hello.world && > + test_path_exists baz/boo/.git/index && > + test_path_exists baz/boo/deeper.world && > ! test -d bar > ' > > @@ -488,12 +488,12 @@ test_expect_success 'should not clean submodules' ' > git checkout before_sub2 && > >to_clean/should_clean.this && > git clean -f -d && > - test_path_is_file repo/.git/index && > - test_path_is_file repo/hello.world && > - test_path_is_file sub1/.git && > - test_path_is_file sub1/hello.world && > - test_path_is_file sub2/.git && > - test_path_is_file sub2/hello.world && > + test_path_exists repo/.git/index && > + test_path_exists repo/hello.world && > + test_path_exists sub1/.git && > + test_path_exists sub1/hello.world && > + test_path_exists sub2/.git && > + test_path_exists sub2/hello.world && > test_path_is_missing to_clean > ' > > @@ -506,8 +506,8 @@ test_expect_success POSIXPERM,SANITY 'should avoid cleaning possible submodules' > chmod 0 possible_sub1/.git && > >to_clean/should_clean.this && > git clean -f -d && > - test_path_is_file possible_sub1/.git && > - test_path_is_file possible_sub1/hello.world && > + test_path_exists possible_sub1/.git && > + test_path_exists possible_sub1/hello.world && > test_path_is_missing to_clean > ' > > @@ -517,7 +517,7 @@ test_expect_success 'nested (empty) git should be kept' ' > mkdir to_clean && > >to_clean/should_clean.this && > git clean -f -d && > - test_path_is_file empty_repo/.git/HEAD && > + test_path_exists empty_repo/.git/HEAD && > test_path_is_missing to_clean > ' > > @@ -559,9 +559,9 @@ test_expect_success 'giving path in nested git work tree will NOT remove it' ' > test_commit msg bar/baz/hello.world > ) && > git clean -f -d repo/bar/baz && > - test_path_is_file repo/.git/HEAD && > + test_path_exists repo/.git/HEAD && > test_path_is_dir repo/bar/ && > - test_path_is_file repo/bar/baz/hello.world > + test_path_exists repo/bar/baz/hello.world > ' > > test_expect_success 'giving path to nested .git will not remove it' ' > @@ -573,7 +573,7 @@ test_expect_success 'giving path to nested .git will not remove it' ' > test_commit msg hello.world > ) && > git clean -f -d repo/.git && > - test_path_is_file repo/.git/HEAD && > + test_path_exists repo/.git/HEAD && > test_path_is_dir repo/.git/refs && > test_path_is_dir repo/.git/objects && > test_path_is_dir untracked/ > @@ -589,7 +589,7 @@ test_expect_success 'giving path to nested .git/ will NOT remove contents' ' > ) && > git clean -f -d repo/.git/ && > test_path_is_dir repo/.git && > - test_path_is_file repo/.git/HEAD && > + test_path_exists repo/.git/HEAD && > test_path_is_dir untracked/ > ' > > @@ -663,11 +663,11 @@ test_expect_success 'git clean -d skips untracked dirs containing ignored files' > touch foo/bar foo/baz foo/a/aa/ignoreme foo/b/ignoreme foo/b/bb/1 foo/b/bb/2 && > git clean -df && > test_path_is_dir foo && > - test_path_is_file foo/bar && > + test_path_exists foo/bar && > test_path_is_missing foo/baz && > - test_path_is_file foo/a/aa/ignoreme && > + test_path_exists foo/a/aa/ignoreme && > test_path_is_missing foo/a/aa/aaa && > - test_path_is_file foo/b/ignoreme && > + test_path_exists foo/b/ignoreme && > test_path_is_missing foo/b/bb > ' > > @@ -688,9 +688,9 @@ test_expect_success 'git clean -d skips nested repo containing ignored files' ' > > git clean -fd && > > - test_path_is_file nested-repo-with-ignored-file/.git/index && > - test_path_is_file nested-repo-with-ignored-file/ignoreme && > - test_path_is_file nested-repo-with-ignored-file/file > + test_path_exists nested-repo-with-ignored-file/.git/index && > + test_path_exists nested-repo-with-ignored-file/ignoreme && > + test_path_exists nested-repo-with-ignored-file/file > ' > > test_expect_success 'git clean handles being told what to clean' ' ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-03-19 20:35 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-03-19 9:52 [PATCH] replace test -f with test_path_is_file Krushnal Patel via GitGitGadget 2021-03-19 18:04 ` Junio C Hamano 2021-03-19 19:24 ` [PATCH v2 0/2] " Krushnal Patel via GitGitGadget 2021-03-19 19:24 ` [PATCH v2 1/2] " krush11 via GitGitGadget 2021-03-19 19:24 ` [PATCH v2 2/2] replaced test -f and test ! -f krush11 via GitGitGadget 2021-03-19 20:34 ` Junio C Hamano
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).