diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-03 17:15:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-03 17:15:47 -0700 |
| commit | 73aeee68477b1c9afd40b654123928fa3f16580a (patch) | |
| tree | 9424e98b4bac1708379f98d0ab117768e256c800 | |
| parent | Merge branch 'jc/cache-tree' into next (diff) | |
| parent | repo-config: deconvolute logics (diff) | |
| download | tgif-73aeee68477b1c9afd40b654123928fa3f16580a.tar.xz | |
Merge branch 'js/repoconfig' into next
* js/repoconfig:
repo-config: deconvolute logics
| -rw-r--r-- | repo-config.c | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/repo-config.c b/repo-config.c index 7e06d1a041..63eda1bb78 100644 --- a/repo-config.c +++ b/repo-config.c @@ -27,36 +27,38 @@ static int show_config(const char* key_, const char* value_) { char value[256]; const char *vptr = value; + int dup_error = 0; if (value_ == NULL) value_ = ""; - if ((use_key_regexp || !strcmp(key_, key)) && - (!use_key_regexp || - !regexec(key_regexp, key_, 0, NULL, 0)) && - (regexp == NULL || + if (!use_key_regexp && strcmp(key_, key)) + return 0; + if (use_key_regexp && regexec(key_regexp, key_, 0, NULL, 0)) + return 0; + if (regexp != NULL && (do_not_match ^ - !regexec(regexp, value_, 0, NULL, 0)))) { - int dup_error = 0; - if (show_keys) - printf("%s ", key_); - if (seen && !do_all) - dup_error = 1; - if (type == T_INT) - sprintf(value, "%d", git_config_int(key_, value_)); - else if (type == T_BOOL) - sprintf(value, "%s", git_config_bool(key_, value_) - ? "true" : "false"); - else - vptr = value_; - seen++; - if (dup_error) { - error("More than one value for the key %s: %s", - key_, vptr); - } - else - printf("%s\n", vptr); + regexec(regexp, value_, 0, NULL, 0))) + return 0; + + if (show_keys) + printf("%s ", key_); + if (seen && !do_all) + dup_error = 1; + if (type == T_INT) + sprintf(value, "%d", git_config_int(key_, value_)); + else if (type == T_BOOL) + vptr = git_config_bool(key_, value_) ? "true" : "false"; + else + vptr = value_; + seen++; + if (dup_error) { + error("More than one value for the key %s: %s", + key_, vptr); } + else + printf("%s\n", vptr); + return 0; } |