Merge branch 'maint'

diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh
index f44b9064ea48b6a6f2ac93f791416e1763607a76..8e391cf9a72c6518217526155cbea93d74b9e626 100755 (executable)
--- 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' "