diff options
author | Jeff King <peff@peff.net> | 2018-06-29 01:05:09 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-07-03 19:35:12 +0300 |
commit | 63583203df51c645aa2bf2988bbdfa3d308ef517 (patch) | |
tree | 4dc97a476030c3b5e5bb75d167b641f87a0ab255 | |
parent | 66f9722882993f60be656afaae4c5c9ac92957e9 (diff) |
config: add CONFIG_ERROR_SILENT handler
We can currently die() or error(), but there's not yet any
way for callers to ask us just to quietly return an error.
Let's give them one.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | config.c | 3 | ||||
-rw-r--r-- | config.h | 1 |
2 files changed, 4 insertions, 0 deletions
@@ -818,6 +818,9 @@ static int git_parse_source(config_fn_t fn, void *data, case CONFIG_ERROR_ERROR: error_return = error("%s", error_msg); break; + case CONFIG_ERROR_SILENT: + error_return = -1; + break; case CONFIG_ERROR_UNSET: BUG("config error action unset"); } @@ -58,6 +58,7 @@ struct config_options { CONFIG_ERROR_UNSET = 0, /* use source-specific default */ CONFIG_ERROR_DIE, /* die() on error */ CONFIG_ERROR_ERROR, /* error() on error, return -1 */ + CONFIG_ERROR_SILENT, /* return -1 */ } error_action; }; |