Merge branch 'maint-1.7.4' into maint

diff --git a/config.c b/config.c
index 0abcada9381a3e6638f94bcf41bf9ee7b96f4de8..d06fb19d511c29e92aa840c664618ca4a6f73fe6 100644 (file)
--- a/config.c
+++ b/config.c
@@ -567,6 +567,12 @@ static int git_default_core_config(const char *var, const char *value)
                return 0;
        }
 
+       if (!strcmp(var, "core.bigfilethreshold")) {
+               long n = git_config_int(var, value);
+               big_file_threshold = 0 < n ? n : 0;
+               return 0;
+       }
+
        if (!strcmp(var, "core.packedgitlimit")) {
                packed_git_limit = git_config_int(var, value);
                return 0;