Skip to content

Commit

Permalink
config: Change output of --get-regexp for valueless keys
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Frank Lichtenheld authored and Junio C Hamano committed Jun 27, 2007
1 parent e373bb7 commit b69ba46
Showing 2 changed files with 12 additions and 2 deletions.
8 changes: 6 additions & 2 deletions builtin-config.c
Original file line number Diff line number Diff line change
@@ -38,8 +38,12 @@ static int show_config(const char* key_, const char* value_)
regexec(regexp, (value_?value_:""), 0, NULL, 0)))
return 0;

if (show_keys)
printf("%s ", key_);
if (show_keys) {
if (value_)
printf("%s ", key_);
else
printf("%s", key_);
}
if (seen && !do_all)
dup_error = 1;
if (type == T_INT)
6 changes: 6 additions & 0 deletions t/t1300-repo-config.sh
Original file line number Diff line number Diff line change
@@ -283,6 +283,12 @@ EOF
test_expect_success 'get variable with no value' \
'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

test_expect_success 'no arguments, but no crash' \

0 comments on commit b69ba46

Please sign in to comment.