admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

t4027,4041: Use test -s to test for an empty file

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brian Gernhardt
2010-06-25 13:20:48 -04:00
committed by Junio C Hamano
parent dd44d419d3
commit 6ed7ddaadb
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
t/t4041-diff-submodule-option.sh
View File

@@ -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' "