Merge branch 'maint-1.7.2' into maint

diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh
index f44b9064ea48b6a6f2ac93f791416e1763607a76..995bdfafecedf6b629acdb3300732a4bb691f23c 100755 (executable)
--- a/t/t4041-diff-submodule-option.sh
+++ b/t/t4041-diff-submodule-option.sh
@@ -85,10 +85,11 @@ EOF
 "
 
 commit_file sm1 &&
-cd sm1 &&
-git reset --hard HEAD~2 >/dev/null &&
-head3=$(git rev-parse --verify HEAD | cut -c1-7) &&
-cd ..
+head3=$(
+       cd sm1 &&
+       git reset --hard HEAD~2 >/dev/null &&
+       git rev-parse --verify HEAD | cut -c1-7
+)
 
 test_expect_success 'modified submodule(backward)' "
        git diff-index -p --submodule=log HEAD >actual &&
@@ -207,17 +208,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 +241,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 +296,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 +332,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' "