aboutsummaryrefslogtreecommitdiffstats
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-01-10 11:52:53 -0800
committerJunio C Hamano <gitster@pobox.com>2022-01-10 11:52:53 -0800
commit4b51386bbfc5d26e552c3c4be135e31cd2f64b44 (patch)
tree5bff7a8a4dee06d92dca0a89976248dc7e571918 /config.c
parentbc61dbac770923a96e2007c3de4027c5d11c6d41 (diff)
parentf5c39c3268107e1f3def70709d509fd24282832c (diff)
downloadgit-4b51386bbfc5d26e552c3c4be135e31cd2f64b44.tar.gz
Merge branch 'ab/usage-die-message'
Code clean-up to hide vreportf() from public API. * ab/usage-die-message: config API: use get_error_routine(), not vreportf() usage.c + gc: add and use a die_message_errno() gc: return from cmd_gc(), don't call exit() usage.c API users: use die_message() for error() + exit 128 usage.c API users: use die_message() for "fatal :" + exit 128 usage.c: add a die_message() routine
Diffstat (limited to 'config.c')
-rw-r--r--config.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/config.c b/config.c
index c5873f3a70..e96b8fdb62 100644
--- a/config.c
+++ b/config.c
@@ -2555,11 +2555,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);