git-merge: add support for branch.<name>.mergeoptions

diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 0c435f957489b011623d320411dbc619163f80a9..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 &&
@@ -96,7 +96,7 @@ test_expect_success setup '
 
        check_have A B C D E F G H I J K L &&
 
-       git prune --grace=off &&
+       git prune &&
 
        check_have A B C D E F G H I J K L &&
 
@@ -115,7 +115,7 @@ test_expect_success rewind '
 
        check_have A B C D E F G H I J K L &&
 
-       git prune --grace=off &&
+       git prune &&
 
        check_have A B C D E F G H I J K L &&
 
@@ -160,7 +160,7 @@ test_expect_success 'reflog expire' '
 
 test_expect_success 'prune and fsck' '
 
-       git prune --grace=off &&
+       git prune &&
        check_fsck &&
 
        check_have A B C D E H L &&