Merge branch 'js/repoconfig' into next

* js/repoconfig:
  repo-config: deconvolute logics
This commit is contained in:
Junio C Hamano 2006-05-03 17:15:47 -07:00
commit 73aeee6847

View File

@ -27,17 +27,20 @@ static int show_config(const char* key_, const char* value_)
{ {
char value[256]; char value[256];
const char *vptr = value; const char *vptr = value;
int dup_error = 0;
if (value_ == NULL) if (value_ == NULL)
value_ = ""; value_ = "";
if ((use_key_regexp || !strcmp(key_, key)) && if (!use_key_regexp && strcmp(key_, key))
(!use_key_regexp || return 0;
!regexec(key_regexp, key_, 0, NULL, 0)) && if (use_key_regexp && regexec(key_regexp, key_, 0, NULL, 0))
(regexp == NULL || return 0;
if (regexp != NULL &&
(do_not_match ^ (do_not_match ^
!regexec(regexp, value_, 0, NULL, 0)))) { regexec(regexp, value_, 0, NULL, 0)))
int dup_error = 0; return 0;
if (show_keys) if (show_keys)
printf("%s ", key_); printf("%s ", key_);
if (seen && !do_all) if (seen && !do_all)
@ -45,8 +48,7 @@ static int show_config(const char* key_, const char* value_)
if (type == T_INT) if (type == T_INT)
sprintf(value, "%d", git_config_int(key_, value_)); sprintf(value, "%d", git_config_int(key_, value_));
else if (type == T_BOOL) else if (type == T_BOOL)
sprintf(value, "%s", git_config_bool(key_, value_) vptr = git_config_bool(key_, value_) ? "true" : "false";
? "true" : "false");
else else
vptr = value_; vptr = value_;
seen++; seen++;
@ -56,7 +58,7 @@ static int show_config(const char* key_, const char* value_)
} }
else else
printf("%s\n", vptr); printf("%s\n", vptr);
}
return 0; return 0;
} }