mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-26 03:36:25 +02:00
Code

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 f067a13745 broke show-config.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-06-24 05:19:30 -07:00
parent 0ec2f6b739
commit acb70149bc
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
repo-config.c
View File

@ -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",