Fourth batch

diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh
index 3d4b1ba23f9eacec4e1bcd29345cc7d3943badce..03489aff14ea72921f66605eeac3ccddd694e923 100755 (executable)
--- a/t/t4006-diff-mode.sh
+++ b/t/t4006-diff-mode.sh
@@ -8,12 +8,12 @@ test_description='Test mode change diffs.
 '
 . ./test-lib.sh
 
-sed_script='s/\(:100644 100755\) \('"$_x40"'\) \2 /\1 X X /'
+sed_script='s/\(:100644 100755\) \('"$OID_REGEX"'\) \2 /\1 X X /'
 
 test_expect_success 'setup' '
        echo frotz >rezrov &&
        git update-index --add rezrov &&
-       tree=`git write-tree` &&
+       tree=$(git write-tree) &&
        echo $tree
 '
 
@@ -34,26 +34,35 @@ test_expect_success 'prepare binary file' '
 
 test_expect_success '--stat output after text chmod' '
        test_chmod -x rezrov &&
-       echo " 0 files changed" >expect &&
+       cat >expect <<-\EOF &&
+        rezrov | 0
+        1 file changed, 0 insertions(+), 0 deletions(-)
+       EOF
        git diff HEAD --stat >actual &&
        test_i18ncmp expect actual
 '
 
 test_expect_success '--shortstat output after text chmod' '
+       tail -n 1 <expect >expect.short &&
        git diff HEAD --shortstat >actual &&
-       test_i18ncmp expect actual
+       test_i18ncmp expect.short actual
 '
 
 test_expect_success '--stat output after binary chmod' '
        test_chmod +x binbin &&
-       echo " 0 files changed" >expect &&
+       cat >expect <<-EOF &&
+        binbin | Bin
+        rezrov |   0
+        2 files changed, 0 insertions(+), 0 deletions(-)
+       EOF
        git diff HEAD --stat >actual &&
        test_i18ncmp expect actual
 '
 
 test_expect_success '--shortstat output after binary chmod' '
+       tail -n 1 <expect >expect.short &&
        git diff HEAD --shortstat >actual &&
-       test_i18ncmp expect actual
+       test_i18ncmp expect.short actual
 '
 
 test_done