t4027,4041: Use test -s to test for an empty file
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>
Brian Gernhardt committed
Jun 25, 2010 at 13:20 UTC
6ed7ddaadba9217b794aecf6d74a2e455daf7a96
2 files changed
+13
-13
t/t4027-diff-submodule.sh
+6
-6
@@ -105,15 +105,15 @@ test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match)'
105
expect_from_to >expect.body $subprev $subprev-dirty &&
106
test_cmp expect.body actual.body &&
107
git diff --ignore-submodules HEAD >actual2 &&
108
- echo -n "" | test_cmp - actual2 &&
108
+ ! test -s actual2 &&
109
git diff --ignore-submodules=untracked HEAD >actual3 &&
110
sed -e "1,/^@@/d" actual3 >actual3.body &&
111
expect_from_to >expect.body $subprev $subprev-dirty &&
112
test_cmp expect.body actual3.body &&
113
git diff --ignore-submodules=dirty HEAD >actual4 &&
114
- echo -n "" | test_cmp - actual4
114
+ ! test -s actual4
115
'
116
-test_done
116
+
117
test_expect_success 'git diff HEAD with dirty submodule (index, refs match)' '
118
(
119
cd sub &&
@@ -139,11 +139,11 @@ test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match)'
139
expect_from_to >expect.body $subprev $subprev-dirty &&
140
test_cmp expect.body actual.body &&
141
git diff --ignore-submodules=all HEAD >actual2 &&
142
- echo -n "" | test_cmp - actual2 &&
142
+ ! test -s actual2 &&
143
git diff --ignore-submodules=untracked HEAD >actual3 &&
144
- echo -n "" | test_cmp - actual3 &&
144
+ ! test -s actual3 &&
145
git diff --ignore-submodules=dirty HEAD >actual4 &&
146
- echo -n "" | test_cmp - actual4
146
+ ! test -s actual4
147
'
148
149
test_expect_success 'git diff (empty submodule dir)' '
t/t4041-diff-submodule-option.sh
+7
-7
@@ -207,17 +207,17 @@ EOF
207
208
test_expect_success 'submodule contains untracked content (untracked ignored)' "
209
git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
210
- echo -n '' | diff actual -
210
+ ! test -s actual
211
"
212
213
test_expect_success 'submodule contains untracked content (dirty ignored)' "
214
git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
215
- echo -n '' | diff actual -
215
+ ! test -s actual
216
"
217
218
test_expect_success 'submodule contains untracked content (all ignored)' "
219
git diff-index -p --ignore-submodules=all --submodule=log HEAD >actual &&
220
- echo -n '' | diff actual -
220
+ ! test -s actual
221
"
222
223
test_expect_success 'submodule contains untracked and modifed content' "
@@ -240,13 +240,13 @@ EOF
240
test_expect_success 'submodule contains untracked and modifed content (dirty ignored)' "
241
echo new > sm1/foo6 &&
242
git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
243
- echo -n '' | diff actual -
243
+ ! test -s actual
244
"
245
246
test_expect_success 'submodule contains untracked and modifed content (all ignored)' "
247
echo new > sm1/foo6 &&
248
git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
249
- echo -n '' | diff actual -
249
+ ! test -s actual
250
"
251
252
test_expect_success 'submodule contains modifed content' "
@@ -295,7 +295,7 @@ EOF
295
296
test_expect_success 'modified submodule contains untracked content (all ignored)' "
297
git diff-index -p --ignore-submodules=all --submodule=log HEAD >actual &&
298
- echo -n '' | diff actual -
298
+ ! test -s actual
299
"
300
301
test_expect_success 'modified submodule contains untracked and modifed content' "
@@ -331,7 +331,7 @@ EOF
331
test_expect_success 'modified submodule contains untracked and modifed content (all ignored)' "
332
echo modification >> sm1/foo6 &&
333
git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
334
- echo -n '' | diff actual -
334
+ ! test -s actual
335
"
336
337
test_expect_success 'modified submodule contains modifed content' "