Sync with v1.8.5.6

diff --git a/config.c b/config.c
index 314d8ee740bea488d8c79d80b3d91530ad15252d..8984ad20c782795a50e314b5023352612f70f0bc 100644 (file)
--- a/config.c
+++ b/config.c
@@ -885,6 +885,16 @@ static int git_default_core_config(const char *var, const char *value)
                return 0;
        }
 
+       if (!strcmp(var, "core.protecthfs")) {
+               protect_hfs = git_config_bool(var, value);
+               return 0;
+       }
+
+       if (!strcmp(var, "core.protectntfs")) {
+               protect_ntfs = git_config_bool(var, value);
+               return 0;
+       }
+
        /* Add other config variables here and to Documentation/config.txt. */
        return 0;
 }