X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=config.c;h=70d105567921fe75518d8d5fe3d3df4aad0659cd;hb=b51b8bbf146d17556226bff14f97957e84aa0207;hp=d537311ae1d4321c3f5f90930f7451262caf2ae5;hpb=dbb2b41aa49aa0cd088f5fabd5326dcfed7144e3;p=git.git diff --git a/config.c b/config.c index d537311ae..70d105567 100644 --- a/config.c +++ b/config.c @@ -331,6 +331,11 @@ int git_default_config(const char *var, const char *value) return 0; } + if (!strcmp(var, "core.deltabasecachelimit")) { + delta_base_cache_limit = git_config_int(var, value); + return 0; + } + if (!strcmp(var, "core.autocrlf")) { if (value && !strcasecmp(value, "input")) { auto_crlf = -1; @@ -911,8 +916,8 @@ int git_config_rename_section(const char *old_name, const char *new_name) } if (!(config_file = fopen(config_filename, "rb"))) { - ret = error("Could not open config file!"); - goto out; + /* no config file means nothing to rename, no error */ + goto unlock_and_out; } while (fgets(buf, sizeof(buf), config_file)) { @@ -946,6 +951,7 @@ int git_config_rename_section(const char *old_name, const char *new_name) } } fclose(config_file); + unlock_and_out: if (close(out_fd) || commit_lock_file(lock) < 0) ret = error("Cannot commit config file!"); out: