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

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>

diff --git a/builtin-config.c b/builtin-config.c
index b2515f7e65ed05a5352639686b5163f4c74bc1c2..dbc2339d0f98d561e0263354321a5f2566f9918a 100644 (file)
--- a/builtin-config.c
+++ b/builtin-config.c
@@ -38,8 +38,12 @@ static int show_config(const char* key_, const char* value_)
                          regexec(regexp, (value_?value_:""), 0, NULL, 0)))
                return 0;
 
                          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)
        if (seen && !do_all)
                dup_error = 1;
        if (type == T_INT)

diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 3f3fd2d7f7cc148948a20e47cccd06751b9a2241..f1a78b19ac6e426f4475b66cfe23b89e41c7fafa 100755 (executable)
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -283,6 +283,12 @@ EOF
 test_expect_success 'get variable with no value' \
        'git-config --get novalue.variable ^$'
 
 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' \
 git-config > output 2>&1
 
 test_expect_success 'no arguments, but no crash' \