diff options
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -1559,9 +1559,12 @@ static int git_default_i18n_config(const char *var, const char *value) static int git_default_branch_config(const char *var, const char *value) { if (!strcmp(var, "branch.autosetupmerge")) { - if (value && !strcasecmp(value, "always")) { + if (value && !strcmp(value, "always")) { git_branch_track = BRANCH_TRACK_ALWAYS; return 0; + } else if (value && !strcmp(value, "inherit")) { + git_branch_track = BRANCH_TRACK_INHERIT; + return 0; } git_branch_track = git_config_bool(var, value); return 0; @@ -2555,11 +2558,12 @@ void git_die_config(const char *key, const char *err, ...) { const struct string_list *values; struct key_value_info *kv_info; + report_fn error_fn = get_error_routine(); if (err) { va_list params; va_start(params, err); - vreportf("error: ", err, params); + error_fn(err, params); va_end(params); } values = git_config_get_value_multi(key); |