undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: Change output of --get-regexp for valueless keys

Browse Source 
Print no space after the name of a key without value.
Otherwise keys without values are printed exactly the
same as keys with empty values.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Frank Lichtenheld 2007-06-25 16:03:54 +02:00 committed by Junio C Hamano
parent e373bb7388
commit b69ba460bb
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin-config.c
View File

@ -38,8 +38,12 @@ static int show_config(const char* key_, const char* value_)
regexec(regexp, (value_?value_:""), 0, NULL, 0))) regexec(regexp, (value_?value_:""), 0, NULL, 0)))
return 0; return 0;
if (show_keys) if (show_keys) {
printf("%s ", key_); if (value_)
printf("%s ", key_);
else
printf("%s", key_);
}
if (seen && !do_all) if (seen && !do_all)
dup_error = 1; dup_error = 1;
if (type == T_INT) if (type == T_INT)

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

@ -283,6 +283,12 @@ EOF
test_expect_success 'get variable with no value' \ test_expect_success 'get variable with no value' \
'git-config --get novalue.variable ^$' 'git-config --get novalue.variable ^$'
echo novalue.variable > expect
test_expect_success 'get-regexp variable with no value' \
'git-config --get-regexp novalue > output &&
cmp output expect'
git-config > output 2>&1 git-config > output 2>&1
test_expect_success 'no arguments, but no crash' \ test_expect_success 'no arguments, but no crash' \