Merge branch 'master' of git://repo.or.cz/git-gui

diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 738d1513d49356d4e7a8eaec4b5df61a0e07881c..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,6 +71,8 @@ test_expect_success setup '
        check_fsck &&
 
        chmod +x C &&
+       ( test "`git config --bool core.filemode`" != false ||
+         echo executable >>C ) &&
        git add C &&
        test_tick && git commit -m dragon &&
        L=`git rev-parse --verify HEAD` &&