sha1_file: rename LOOKUP_REPLACE_OBJECT

diff --git a/t/t4063-diff-blobs.sh b/t/t4063-diff-blobs.sh
index 90c6f6b85b03be696164a619f4cb173f2281fdeb..bc69e26c524b7cc099aebad7729039a45bedc398 100755 (executable)
--- a/t/t4063-diff-blobs.sh
+++ b/t/t4063-diff-blobs.sh
@@ -55,7 +55,7 @@ test_expect_success 'diff by tree:path (run)' '
 test_expect_success 'index of tree:path diff' '
        check_index $sha1_one $sha1_two
 '
-test_expect_failure 'tree:path diff uses filenames as paths' '
+test_expect_success 'tree:path diff uses filenames as paths' '
        check_paths one two
 '
 test_expect_success 'tree:path diff shows mode change' '
@@ -68,10 +68,10 @@ test_expect_success 'diff by ranged tree:path' '
 test_expect_success 'index of ranged tree:path diff' '
        check_index $sha1_one $sha1_two
 '
-test_expect_failure 'ranged tree:path diff uses filenames as paths' '
+test_expect_success 'ranged tree:path diff uses filenames as paths' '
        check_paths one two
 '
-test_expect_failure 'ranged tree:path diff shows mode change' '
+test_expect_success 'ranged tree:path diff shows mode change' '
        check_mode 100644 100755
 '
 
@@ -81,11 +81,16 @@ test_expect_success 'diff blob against file' '
 test_expect_success 'index of blob-file diff' '
        check_index $sha1_one $sha1_two
 '
-test_expect_failure 'blob-file diff uses filename as paths' '
+test_expect_success 'blob-file diff uses filename as paths' '
        check_paths one two
 '
 test_expect_success FILEMODE 'blob-file diff shows mode change' '
        check_mode 100644 100755
 '
 
+test_expect_success 'blob-file diff prefers filename to sha1' '
+       run_diff $sha1_one two &&
+       check_paths two two
+'
+
 test_done