From: Brian Gernhardt <brian@silverinsanity.com>
To: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Cc: Brandon Casey <brandon.casey.ctr@nrlssc.navy.mil>
Subject: [PATCH] t4027,4041: Use test -s to test for an empty file
Date: Fri, 25 Jun 2010 13:20:48 -0400 [thread overview]
Message-ID: <20100625172047.GA16172@hermes> (raw)
The tests used a mixture of 'echo -n' (which is non-portable) and either
test_cmp or diff to check if a file is empty. The much easier and portable
method to check for an empty file is '! test -s'
While we're in t4027, there was an excess test_done. Remove it.
Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
---
Changes since v2:
- extra trailing dashes removed (noticed by Brandon Casey)
- extra test_done removed (noticed by Junio C Hamano)
t/t4027-diff-submodule.sh | 12 ++++++------
t/t4041-diff-submodule-option.sh | 14 +++++++-------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh
index 559b41e..1bd8e5e 100755
--- a/t/t4027-diff-submodule.sh
+++ b/t/t4027-diff-submodule.sh
@@ -105,15 +105,15 @@ test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match)'
expect_from_to >expect.body $subprev $subprev-dirty &&
test_cmp expect.body actual.body &&
git diff --ignore-submodules HEAD >actual2 &&
- echo -n "" | test_cmp - actual2 &&
+ ! test -s actual2 &&
git diff --ignore-submodules=untracked HEAD >actual3 &&
sed -e "1,/^@@/d" actual3 >actual3.body &&
expect_from_to >expect.body $subprev $subprev-dirty &&
test_cmp expect.body actual3.body &&
git diff --ignore-submodules=dirty HEAD >actual4 &&
- echo -n "" | test_cmp - actual4
+ ! test -s actual4
'
-test_done
+
test_expect_success 'git diff HEAD with dirty submodule (index, refs match)' '
(
cd sub &&
@@ -139,11 +139,11 @@ test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match)'
expect_from_to >expect.body $subprev $subprev-dirty &&
test_cmp expect.body actual.body &&
git diff --ignore-submodules=all HEAD >actual2 &&
- echo -n "" | test_cmp - actual2 &&
+ ! test -s actual2 &&
git diff --ignore-submodules=untracked HEAD >actual3 &&
- echo -n "" | test_cmp - actual3 &&
+ ! test -s actual3 &&
git diff --ignore-submodules=dirty HEAD >actual4 &&
- echo -n "" | test_cmp - actual4
+ ! test -s actual4
'
test_expect_success 'git diff (empty submodule dir)' '
diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh
index f44b906..8e391cf 100755
--- a/t/t4041-diff-submodule-option.sh
+++ b/t/t4041-diff-submodule-option.sh
@@ -207,17 +207,17 @@ EOF
test_expect_success 'submodule contains untracked content (untracked ignored)' "
git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
- echo -n '' | diff actual -
+ ! test -s actual
"
test_expect_success 'submodule contains untracked content (dirty ignored)' "
git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
- echo -n '' | diff actual -
+ ! test -s actual
"
test_expect_success 'submodule contains untracked content (all ignored)' "
git diff-index -p --ignore-submodules=all --submodule=log HEAD >actual &&
- echo -n '' | diff actual -
+ ! test -s actual
"
test_expect_success 'submodule contains untracked and modifed content' "
@@ -240,13 +240,13 @@ EOF
test_expect_success 'submodule contains untracked and modifed content (dirty ignored)' "
echo new > sm1/foo6 &&
git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
- echo -n '' | diff actual -
+ ! test -s actual
"
test_expect_success 'submodule contains untracked and modifed content (all ignored)' "
echo new > sm1/foo6 &&
git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
- echo -n '' | diff actual -
+ ! test -s actual
"
test_expect_success 'submodule contains modifed content' "
@@ -295,7 +295,7 @@ EOF
test_expect_success 'modified submodule contains untracked content (all ignored)' "
git diff-index -p --ignore-submodules=all --submodule=log HEAD >actual &&
- echo -n '' | diff actual -
+ ! test -s actual
"
test_expect_success 'modified submodule contains untracked and modifed content' "
@@ -331,7 +331,7 @@ EOF
test_expect_success 'modified submodule contains untracked and modifed content (all ignored)' "
echo modification >> sm1/foo6 &&
git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
- echo -n '' | diff actual -
+ ! test -s actual
"
test_expect_success 'modified submodule contains modifed content' "
--
1.7.1.756.gb48b1
reply other threads:[~2010-06-25 17:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20100625172047.GA16172@hermes \
--to=brian@silverinsanity.com \
--cc=brandon.casey.ctr@nrlssc.navy.mil \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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).