From: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
To: git@vger.kernel.org
Cc: Jens.Lehmann@web.de, "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
Subject: [PATCH] test-lib-functions: avoid non POSIX ERE in test_dir_is_empty()
Date: Wed, 25 Aug 2021 20:17:10 -0700 [thread overview]
Message-ID: <20210826031710.32980-1-carenas@gmail.com> (raw)
0be7d9b73d (test-lib: add test_dir_is_empty(), 2014-06-19) uses an
ERE through the egrep tool (which is not POSIX) using an ? operator
that isn't either.
replace invocation with two equivalent simpler BRE instead.
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
t/test-lib-functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index e28411bb75..2803c97df3 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -790,7 +790,7 @@ test_path_exists () {
test_dir_is_empty () {
test "$#" -ne 1 && BUG "1 param"
test_path_is_dir "$1" &&
- if test -n "$(ls -a1 "$1" | egrep -v '^\.\.?$')"
+ if test -n "$(ls -a1 "$1" | grep -v '^\.$' | grep -v '^\.\.$')"
then
echo "Directory '$1' is not empty, it contains:"
ls -la "$1"
--
2.33.0.481.g26d3bed244
next reply other threads:[~2021-08-26 3:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-26 3:17 Carlo Marcelo Arenas Belón [this message]
2021-08-26 4:24 ` [PATCH] test-lib-functions: avoid non POSIX ERE in test_dir_is_empty() Taylor Blau
2021-08-26 6:25 ` Junio C Hamano
2021-08-26 7:48 ` Carlo Arenas
2021-08-26 6:28 ` Carlo Arenas
2021-08-26 19:21 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210826031710.32980-1-carenas@gmail.com \
--to=carenas@gmail.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
/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.
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).