From: "krush11 via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Krushnal Patel <krushnalpatel11@gmail.com>,
krush11 <krushnalpatel11@gmail.com>
Subject: [PATCH v2 2/2] replaced test -f and test ! -f
Date: Fri, 19 Mar 2021 19:24:53 +0000 [thread overview]
Message-ID: <a31a147a34f809cb1eaa973890c7d50eb5a3ffb8.1616181893.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.982.v2.git.git.1616181893.gitgitgadget@gmail.com>
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
next prev parent reply other threads:[~2021-03-19 19:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` krush11 via GitGitGadget [this message]
2021-03-19 20:34 ` [PATCH v2 2/2] replaced test -f and test ! -f Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a31a147a34f809cb1eaa973890c7d50eb5a3ffb8.1616181893.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=krushnalpatel11@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).