From: Eric Sunshine <sunshine@sunshineco.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: wchargin@gmail.com, Git List <git@vger.kernel.org>
Subject: Re: [PATCH 1/1] t/test-lib: make `test_dir_is_empty` more robust
Date: Sun, 5 Aug 2018 01:23:05 -0400 [thread overview]
Message-ID: <CAPig+cQSryjWrFZML_g0fR5oq6dzVaWPXm_4R-Jg_ay1R2DzbQ@mail.gmail.com> (raw)
In-Reply-To: <20180805041956.GI258270@aiede.svl.corp.google.com>
On Sun, Aug 5, 2018 at 12:20 AM Jonathan Nieder <jrnieder@gmail.com> wrote:
> William Chargin wrote:
> > test_dir_is_empty () {
> > test_path_is_dir "$1" &&
> > - if test -n "$(ls -a1 "$1" | egrep -v '^\.\.?$')"
> > + if test "$(ls -A1 "$1" | wc -c)" != 0
>
> Another portability gotcha: wc output includes a space on Mac so this
> test would always return true there. How about
>
> if test -n "$(ls -A1 "$1")"
>
> "ls -A" was added in POSIX.1-2017. [...]
> That's very recent, but the widespread implementation it mentions is
> less so. This would be our first use of "ls -A", so I'd be interested
> to hear from people on more obscure platforms. It does seem to be
> widespread.
A simpler approach, without the portability concerns of -A, would be
to remove the "." and ".." lines from the top of the listing:
ls -f1 "$1" | sed '1,2d'
If we're worried about -f not being sufficiently portable, then an
even simpler approach would be to check whether the output of 'ls -a1'
has more lines than the two expected ("." and ".."):
test $(ls -a1 "$1" | wc -l) -gt 2
I think I favor this final implementation over the others.
next prev parent reply other threads:[~2018-08-05 5:37 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-05 2:20 [PATCH 0/1] t/test-lib: make `test_dir_is_empty` more robust William Chargin
2018-08-05 2:20 ` [PATCH 1/1] " William Chargin
2018-08-05 4:19 ` Jonathan Nieder
2018-08-05 5:23 ` Eric Sunshine [this message]
2018-08-05 20:52 ` Jeff King
2018-08-06 13:02 ` Jeff King
2018-08-06 17:52 ` Eric Sunshine
2018-08-12 4:06 ` [PATCH v3] test_dir_is_empty: properly detect files with newline in name William Chargin
2018-08-12 6:17 ` Eric Sunshine
2018-08-12 6:32 ` William Chargin
2018-08-12 6:44 ` Eric Sunshine
2018-09-12 18:35 ` [PATCH v4] test_dir_is_empty: fix edge cases with newlines and hyphens William Chargin
2018-09-12 19:50 ` Junio C Hamano
2018-09-12 18:37 ` William Chargin
2018-08-12 4:06 ` [PATCH 1/1] t/test-lib: make `test_dir_is_empty` more robust William Chargin
2018-08-05 5:24 ` William Chargin
2018-08-05 6:34 ` Jonathan Nieder
2018-08-05 6:03 ` Junio C Hamano
2018-08-05 6:23 ` Jonathan Nieder
2018-08-05 3:36 ` [PATCH 0/1] " Jonathan Nieder
2018-08-05 4:19 ` William Chargin
2018-08-05 4:20 ` [PATCH v2] " William Chargin
2018-08-05 8:34 ` Johannes Sixt
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=CAPig+cQSryjWrFZML_g0fR5oq6dzVaWPXm_4R-Jg_ay1R2DzbQ@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=wchargin@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).