summaryrefslogtreecommitdiff
path: root/builtin/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-03 22:53:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-03 22:53:07 (GMT)
commit3e06f5ff3870279f3bf2f97d4a4256032575055e (patch)
tree28b499c52dda30a471536facf32a6a542c45a8eb /builtin/config.c
parent16d26b168b371b2f4f86b1adb61470c6b08b27b9 (diff)
parent9409c7a5b33d6a4d68f58ccb1034fa50c92cac68 (diff)
downloadgit-3e06f5ff3870279f3bf2f97d4a4256032575055e.zip
git-3e06f5ff3870279f3bf2f97d4a4256032575055e.tar.gz
git-3e06f5ff3870279f3bf2f97d4a4256032575055e.tar.bz2
Merge branch 'jc/maint-config-exit-status'
The exit status code from "git config" was way overspecified while being incorrect. Update the implementation to give the documented status for a case that was documented, and introduce a new code for "all other errors". * jc/maint-config-exit-status: config: "git config baa" should exit with status 1
Diffstat (limited to 'builtin/config.c')
-rw-r--r--builtin/config.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/builtin/config.c b/builtin/config.c
index 8cd08da..ada6e12 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -160,7 +160,7 @@ static int show_config(const char *key_, const char *value_, void *cb)
static int get_value(const char *key_, const char *regex_)
{
- int ret = -1;
+ int ret = CONFIG_GENERIC_ERROR;
char *global = NULL, *xdg = NULL, *repo_config = NULL;
const char *system_wide = NULL, *local;
struct config_include_data inc = CONFIG_INCLUDE_INIT;
@@ -196,11 +196,14 @@ static int get_value(const char *key_, const char *regex_)
if (regcomp(key_regexp, key, REG_EXTENDED)) {
fprintf(stderr, "Invalid key pattern: %s\n", key_);
free(key);
+ ret = CONFIG_INVALID_PATTERN;
goto free_strings;
}
} else {
- if (git_config_parse_key(key_, &key, NULL))
+ if (git_config_parse_key(key_, &key, NULL)) {
+ ret = CONFIG_INVALID_KEY;
goto free_strings;
+ }
}
if (regex_) {
@@ -212,6 +215,7 @@ static int get_value(const char *key_, const char *regex_)
regexp = (regex_t*)xmalloc(sizeof(regex_t));
if (regcomp(regexp, regex_, REG_EXTENDED)) {
fprintf(stderr, "Invalid pattern: %s\n", regex_);
+ ret = CONFIG_INVALID_PATTERN;
goto free_strings;
}
}