summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-04-09 13:42:54 -0400
committerJunio C Hamano <gitster@pobox.com>2016-04-10 11:14:45 -0700
commit9c14bb08a434570adc9b2f0f37eac66b92d4c87e (patch)
tree7d11eb6dbfb5b706b6d000d2b29e1d16e97206cc
parent8c3ca351cb125c94870d7b8278a7efa1f1474d22 (diff)
downloadgit-9c14bb08a434570adc9b2f0f37eac66b92d4c87e.tar.gz
git_config_set_multivar_in_file: all non-zero returns are errors
This function is just a thin wrapper for the "_gently" form of the function. But the gently form is designed to feed builtin/config.c, which passes our return code directly to its exit status, and thus uses positive error values for some cases. We check only negative values, meaning we would fail to die in some cases (e.g., a malformed key). This may or may not be triggerable in practice; we tend to use this non-gentle form only when setting internal variables, which would not have malformed keys. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/config.c b/config.c
index 92b0cf447f..d349d52f26 100644
--- a/config.c
+++ b/config.c
@@ -2222,7 +2222,7 @@ void git_config_set_multivar_in_file(const char *config_filename,
const char *value_regex, int multi_replace)
{
if (git_config_set_multivar_in_file_gently(config_filename, key, value,
- value_regex, multi_replace) < 0)
+ value_regex, multi_replace))
die(_("could not set '%s' to '%s'"), key, value);
}