diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:09:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:09:09 -0700 |
| commit | 4c3fda0920ef49b323416685ec843d6a12a27b3f (patch) | |
| tree | b50dcd5c23440056becbd89a2c6c0527892c2adc /builtin | |
| parent | f6854cad2a7a7da0a360bd520d2a86af89a36c6c (diff) | |
| parent | 9409c7a5b33d6a4d68f58ccb1034fa50c92cac68 (diff) | |
| download | git-4c3fda0920ef49b323416685ec843d6a12a27b3f.tar.gz | |
Merge branch 'jc/maint-config-exit-status' into maint-1.7.11
* jc/maint-config-exit-status:
config: "git config baa" should exit with status 1
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/config.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/builtin/config.c b/builtin/config.c index 33c8820af6..b44277c23e 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, *repo_config = NULL; const char *system_wide = NULL, *local; struct config_include_data inc = CONFIG_INCLUDE_INIT; @@ -198,11 +198,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_) { @@ -214,6 +217,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; } } |