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 8e8d526ef2e68fb8f50b9164f2ff032bafa104d6..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" ;;
@@ -71,7 +71,7 @@ test_expect_success setup '
        check_fsck &&
 
        chmod +x C &&
-       ( test "`git repo-config --bool core.filemode`" != false ||
+       ( test "`git config --bool core.filemode`" != false ||
          echo executable >>C ) &&
        git add C &&
        test_tick && git commit -m dragon &&