Merge branch 'jk/cat-file-buffered-batch-all'

diff --git a/t/t4047-diff-dirstat.sh b/t/t4047-diff-dirstat.sh
index 0d50dce97e86a26bac7c798f020a1807936cc3c3..447a8ffa3a111dcc6ddec8b6081097f4127d2e59 100755 (executable)
--- a/t/t4047-diff-dirstat.sh
+++ b/t/t4047-diff-dirstat.sh
@@ -248,7 +248,8 @@ EOF
        git rm -r src/move/unchanged &&
        git rm -r src/move/changed &&
        git rm -r src/move/rearranged &&
-       git commit -m "changes"
+       git commit -m "changes" &&
+       git config diff.renames false
 '
 
 cat <<EOF >expect_diff_stat
@@ -374,7 +375,7 @@ test_expect_success 'later options override earlier options:' '
        git diff --dirstat=files,10,cumulative,changes,noncumulative,3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
        test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
        git diff --dirstat=files,10,cumulative,changes,noncumulative,3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-       test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
+       test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC &&
        git diff --dirstat=files --dirstat=10 --dirstat=cumulative --dirstat=changes --dirstat=noncumulative -X3 HEAD^..HEAD >actual_diff_dirstat &&
        test_cmp expect_diff_dirstat actual_diff_dirstat &&
        git diff --dirstat=files --dirstat=10 --dirstat=cumulative --dirstat=changes --dirstat=noncumulative -X3 -M HEAD^..HEAD >actual_diff_dirstat_M &&