merge-recursive: improve add_cacheinfo error handling

diff --git a/t/t6501-freshen-objects.sh b/t/t6501-freshen-objects.sh
index 394b169eada7968875e931c5a43f25a808cfc18f..765cced60b1055e1187e1fdc1c1c881814cebbf6 100755 (executable)
--- a/t/t6501-freshen-objects.sh
+++ b/t/t6501-freshen-objects.sh
@@ -73,7 +73,7 @@ for repack in '' true; do
 
        test_expect_success "simulate time passing ($title)" '
                find .git/objects -type f |
-               xargs test-chmtime -v -86400
+               xargs test-tool chmtime -v -86400
        '
 
        test_expect_success "start writing new commit with old blob ($title)" '
@@ -104,7 +104,7 @@ for repack in '' true; do
        test_expect_success "abandon objects again ($title)" '
                git reset --hard HEAD^ &&
                find .git/objects -type f |
-               xargs test-chmtime -v -86400
+               xargs test-tool chmtime -v -86400
        '
 
        test_expect_success "start writing new commit with same tree ($title)" '