t4002 (diff-basic): use test_might_fail for commands that might fail
Also replace '|| return 1' by '&&' to allow chain of operations to be checked for proper return status, and modify the update-index command as suggested by Jonathan Nieder to not exit early but try to make sure files that match the work tree are marked as matching. Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Oct 3, 2010 at 14:00 UTC
b62b3436ffa6acc27a431f29fb25aa08eb441940
1 file changed
+6
-6
t/t4002-diff-basic.sh
+6
-6
@@ -205,8 +205,8 @@ test_expect_success \
205
'rm -fr Z [A-Z][A-Z] &&
206
git read-tree $tree_A &&
207
git checkout-index -f -a &&
208
- git read-tree --reset $tree_O || return 1
209
- git update-index --refresh >/dev/null ;# this can exit non-zero
208
+ git read-tree --reset $tree_O &&
209
+ test_must_fail git update-index --refresh -q &&
210
git diff-files >.test-a &&
211
cmp_diff_files_output .test-a .test-recursive-OA'
212
@@ -215,8 +215,8 @@ test_expect_success \
215
'rm -fr Z [A-Z][A-Z] &&
216
git read-tree $tree_B &&
217
git checkout-index -f -a &&
218
- git read-tree --reset $tree_O || return 1
219
- git update-index --refresh >/dev/null ;# this can exit non-zero
218
+ git read-tree --reset $tree_O &&
219
+ test_must_fail git update-index --refresh -q &&
220
git diff-files >.test-a &&
221
cmp_diff_files_output .test-a .test-recursive-OB'
222
@@ -225,8 +225,8 @@ test_expect_success \
225
'rm -fr Z [A-Z][A-Z] &&
226
git read-tree $tree_B &&
227
git checkout-index -f -a &&
228
- git read-tree --reset $tree_A || return 1
229
- git update-index --refresh >/dev/null ;# this can exit non-zero
228
+ git read-tree --reset $tree_A &&
229
+ test_must_fail git update-index --refresh -q &&
230
git diff-files >.test-a &&
231
cmp_diff_files_output .test-a .test-recursive-AB'
232