merge-recursive: improve add_cacheinfo error handling

diff --git a/t/t4011-diff-symlink.sh b/t/t4011-diff-symlink.sh
index 7452fce0da94a257f289a9fad1e9d24dd1509195..cf0f3a1ee75dd28c6b5ce2a5db7c3ad6afafd21f 100755 (executable)
--- a/t/t4011-diff-symlink.sh
+++ b/t/t4011-diff-symlink.sh
@@ -73,7 +73,7 @@ test_expect_success 'diff identical, but newly created symlink and file' '
        >expected &&
        rm -f frotz nitfol &&
        echo xyzzy >nitfol &&
-       test-chmtime +10 nitfol &&
+       test-tool chmtime +10 nitfol &&
        if test_have_prereq SYMLINKS
        then
                ln -s xyzzy frotz
@@ -139,13 +139,11 @@ test_expect_success SYMLINKS 'setup symlinks with attributes' '
 test_expect_success SYMLINKS 'symlinks do not respect userdiff config by path' '
        cat >expect <<-\EOF &&
        diff --git a/file.bin b/file.bin
-       new file mode 100644
-       index 0000000..d95f3ad
-       Binary files /dev/null and b/file.bin differ
+       index e69de29..d95f3ad 100644
+       Binary files a/file.bin and b/file.bin differ
        diff --git a/link.bin b/link.bin
-       new file mode 120000
-       index 0000000..dce41ec
-       --- /dev/null
+       index e69de29..dce41ec 120000
+       --- a/link.bin
        +++ b/link.bin
        @@ -0,0 +1 @@
        +file.bin