find(1) has a builtin (-prune) to filter its output, save a bit of time
for invoking grep(1).
In addition, in a later change, we will try to use test_line_count_cmd
to count number of lines in stdout and/or stderr of a command, due to
limitation of current implementation, it can handle pipe.
Let's replace grep(1)'s usage with find(1) builtin filter.
Signed-off-by: Đoàn Trần Công Danh <redacted>
---
t/t6402-merge-rename.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t6402-merge-rename.sh b/t/t6402-merge-rename.sh
index 425dad97d5..5d76cd6414 100755
--- a/t/t6402-merge-rename.sh
+++ b/t/t6402-merge-rename.sh
@@ -546,7 +546,7 @@ then
test_must_fail git diff --quiet &&
- test 3 -eq $(find . | grep -v .git | wc -l) &&
+ test 3 -eq $(find . -name .git -prune -o -print | wc -l) &&
test_path_is_file one &&
test_path_is_file two &&
@@ -565,7 +565,7 @@ else
test_must_fail git diff --quiet &&
- test 4 -eq $(find . | grep -v .git | wc -l) &&
+ test 4 -eq $(find . -name .git -prune -o -print | wc -l) &&
test_path_is_dir one &&
test_path_is_file one~rename-two &&
@@ -593,7 +593,7 @@ test_expect_success 'pair rename to parent of other (D/F conflicts) w/ clean sta
test_must_fail git diff --quiet &&
- test 3 -eq $(find . | grep -v .git | wc -l) &&
+ test 3 -eq $(find . -name .git -prune -o -print | wc -l) &&
test_path_is_file one &&
test_path_is_file two &&
--
2.32.0.278.gd42b80f139