summaryrefslogtreecommitdiff
path: root/builtin/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-18 04:37:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-18 04:37:12 (GMT)
commite22bb14d8064fe86e956ae500548d4365035f6b2 (patch)
treeff2983ffda5eaedec6d58742bc53bb29ea6380c4 /builtin/config.c
parent3f7d11c45421051a010690c3b9cc28bce98b8c3f (diff)
parent008e3cc5d781273053c79d1ccf8cc3bf36086a07 (diff)
downloadgit-e22bb14d8064fe86e956ae500548d4365035f6b2.zip
git-e22bb14d8064fe86e956ae500548d4365035f6b2.tar.gz
git-e22bb14d8064fe86e956ae500548d4365035f6b2.tar.bz2
Merge branch 'mm/maint-config-explicit-bool-display'
* mm/maint-config-explicit-bool-display: config: display key_delim for config --bool --get-regexp
Diffstat (limited to 'builtin/config.c')
-rw-r--r--builtin/config.c20
1 files changed, 13 insertions, 7 deletions
diff --git a/builtin/config.c b/builtin/config.c
index 0b4ecac..0315ad7 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -99,6 +99,7 @@ static int show_config(const char *key_, const char *value_, void *cb)
const char *vptr = value;
int must_free_vptr = 0;
int dup_error = 0;
+ int must_print_delim = 0;
if (!use_key_regexp && strcmp(key_, key))
return 0;
@@ -109,10 +110,8 @@ static int show_config(const char *key_, const char *value_, void *cb)
return 0;
if (show_keys) {
- if (value_)
- printf("%s%c", key_, key_delim);
- else
- printf("%s", key_);
+ printf("%s", key_);
+ must_print_delim = 1;
}
if (seen && !do_all)
dup_error = 1;
@@ -130,16 +129,23 @@ static int show_config(const char *key_, const char *value_, void *cb)
} else if (types == TYPE_PATH) {
git_config_pathname(&vptr, key_, value_);
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++;
if (dup_error) {
error("More than one value for the key %s: %s",
key_, vptr);
}
- else
+ else {
+ if (must_print_delim)
+ printf("%c", key_delim);
printf("%s%c", vptr, term);
+ }
if (must_free_vptr)
/* If vptr must be freed, it's a pointer to a
* dynamically allocated buffer, it's safe to cast to