Merge branch 'maint'

diff --git a/t/t3307-notes-man.sh b/t/t3307-notes-man.sh
index 3269f2eebdbb71acd7c88edee2b6efe809637ade..1aa366a410e9a3e2ad4c2fa84431198fbb553a5f 100755 (executable)
--- a/t/t3307-notes-man.sh
+++ b/t/t3307-notes-man.sh
@@ -26,13 +26,13 @@ test_expect_success 'example 1: notes to add an Acked-by line' '
 '
 
 test_expect_success 'example 2: binary notes' '
-       cp "$TEST_DIRECTORY"/test4012.png .
+       cp "$TEST_DIRECTORY"/test-binary-1.png . &&
        git checkout B &&
-       blob=$(git hash-object -w test4012.png) &&
+       blob=$(git hash-object -w test-binary-1.png) &&
        git notes --ref=logo add -C "$blob" &&
        git notes --ref=logo copy B C &&
        git notes --ref=logo show C >actual &&
-       test_cmp test4012.png actual
+       test_cmp test-binary-1.png actual
 '
 
 test_done