kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

config: display key_delim for config --bool --get-regexp 

The previous logic in show_config was to print the delimiter when the
value was set, but Boolean variables have an implicit value "true" when
they appear with no value in the config file. As a result, we got:

git_Config        --get-regexp '.*\.Boolean'	#1. Ok: example.boolean
git_Config --bool --get-regexp '.*\.Boolean'	#2. NO: example.booleantrue

Fix this by defering the display of the separator until after the value
to display has been computed.

Reported-by: Brian Foster <brian.foster@maxim-ic.com>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Matthieu Moy 2011-10-10 14:54:51 +02:00 committed by Junio C Hamano
parent 7ed863a85a
commit 008e3cc5d7
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
builtin/config.c
View File

@ -99,6 +99,7 @@ static int show_config(const char *key_, const char *value_, void *cb)
const char *vptr = value; const char *vptr = value;
int must_free_vptr = 0; int must_free_vptr = 0;
int dup_error = 0; int dup_error = 0;
int must_print_delim = 0;


if (!use_key_regexp && strcmp(key_, key)) if (!use_key_regexp && strcmp(key_, key))
return 0; return 0;
@ -109,10 +110,8 @@ static int show_config(const char *key_, const char *value_, void *cb)
return 0; return 0;


if (show_keys) { if (show_keys) {
if (value_) printf("%s", key_);
printf("%s%c", key_, key_delim); must_print_delim = 1;
else
printf("%s", key_);
} }
if (seen && !do_all) if (seen && !do_all)
dup_error = 1; dup_error = 1;
@ -130,16 +129,23 @@ static int show_config(const char *key_, const char *value_, void *cb)
} else if (types == TYPE_PATH) { } else if (types == TYPE_PATH) {
git_config_pathname(&vptr, key_, value_); git_config_pathname(&vptr, key_, value_);
must_free_vptr = 1; must_free_vptr = 1;
} else if (value_) {
vptr = value_;
} else {
/* Just show the key name */
vptr = "";
must_print_delim = 0;
} }
else
vptr = value_?value_:"";
seen++; seen++;
if (dup_error) { if (dup_error) {
error("More than one value for the key %s: %s", error("More than one value for the key %s: %s",
key_, vptr); key_, vptr);
} }
else else {
if (must_print_delim)
printf("%c", key_delim);
printf("%s%c", vptr, term); printf("%s%c", vptr, term);
}
if (must_free_vptr) if (must_free_vptr)
/* If vptr must be freed, it's a pointer to a /* If vptr must be freed, it's a pointer to a
* dynamically allocated buffer, it's safe to cast to * dynamically allocated buffer, it's safe to cast to

6
t/t1300-repo-config.sh
View File

@ -333,6 +333,12 @@ test_expect_success 'get-regexp variable with no value' \
'git config --get-regexp novalue > output && 'git config --get-regexp novalue > output &&
cmp output expect' cmp output expect'


echo 'novalue.variable true' > expect

test_expect_success 'get-regexp --bool variable with no value' \
'git config --bool --get-regexp novalue > output &&
cmp output expect'

echo 'emptyvalue.variable ' > expect echo 'emptyvalue.variable ' > expect


test_expect_success 'get-regexp variable with empty value' \ test_expect_success 'get-regexp variable with empty value' \