Move make_cache_entry() from merge-recursive.c into read-cache.c

diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 47d124732cd04481d6a21e927aa6104f63e21fbf..e5bbc384f7f4e56b13a13bf2bedad1427e257652 100755 (executable)
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -20,7 +20,7 @@ check_have () {
 }
 
 check_fsck () {
-       output=$(git fsck-objects --full)
+       output=$(git fsck --full)
        case "$1" in
        '')
                test -z "$output" ;;