Sync with maint

diff --git a/t/t1050-large.sh b/t/t1050-large.sh
index 00d2f33df0d9ff6110a649d06c954bde6aaf83ed..f5a91192903b455df3d7d13d8009ea90999405e3 100755 (executable)
--- a/t/t1050-large.sh
+++ b/t/t1050-large.sh
@@ -13,7 +13,7 @@ test_expect_success setup '
        echo X | dd of=large2 bs=1k seek=2000 &&
        echo X | dd of=large3 bs=1k seek=2000 &&
        echo Y | dd of=huge bs=1k seek=2500 &&
-       GIT_ALLOC_LIMIT=1500 &&
+       GIT_ALLOC_LIMIT=1500k &&
        export GIT_ALLOC_LIMIT
 '
 
@@ -116,6 +116,16 @@ test_expect_success 'diff --stat' '
        git diff --stat HEAD^ HEAD
 '
 
+test_expect_success 'diff' '
+       git diff HEAD^ HEAD >actual &&
+       grep "Binary files.*differ" actual
+'
+
+test_expect_success 'diff --cached' '
+       git diff --cached HEAD^ >actual &&
+       grep "Binary files.*differ" actual
+'
+
 test_expect_success 'hash-object' '
        git hash-object large1
 '