diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-24 05:19:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-24 05:19:30 -0700 |
| commit | acb70149bc5e9b9d99631a0cb59e7c2f80e92ddd (patch) | |
| tree | cc94c697b8150307ae0510743c3ddb8418e1bf01 /repo-config.c | |
| parent | 0ec2f6b7392f8f041fd48f824bbf22c4dd13ac40 (diff) | |
| download | git-acb70149bc5e9b9d99631a0cb59e7c2f80e92ddd.tar.gz git-acb70149bc5e9b9d99631a0cb59e7c2f80e92ddd.tar.xz | |
repo-config: fix printing of bool
When a bool variable appears without any value, it means true.
However, replacing the NULL value with an empty string, an earlier
commit f067a13745fbeae1aa357876348a00e5edd0a629 broke show-config.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'repo-config.c')
| -rw-r--r-- | repo-config.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/repo-config.c b/repo-config.c index ab8f1afee..743f02b7d 100644 --- a/repo-config.c +++ b/repo-config.c @@ -29,16 +29,13 @@ static int show_config(const char* key_, const char* value_) const char *vptr = value; int dup_error = 0; - if (value_ == NULL) - value_ = ""; - 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))) + regexec(regexp, (value_?value_:""), 0, NULL, 0))) return 0; if (show_keys) @@ -46,11 +43,11 @@ static int show_config(const char* key_, const char* value_) if (seen && !do_all) dup_error = 1; if (type == T_INT) - sprintf(value, "%d", git_config_int(key_, value_)); + sprintf(value, "%d", git_config_int(key_, value_?value_:"")); else if (type == T_BOOL) vptr = git_config_bool(key_, value_) ? "true" : "false"; else - vptr = value_; + vptr = value_?value_:""; seen++; if (dup_error) { error("More than one value for the key %s: %s", |