diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-06-27 05:33:24 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-27 05:45:29 +0400 |
| commit | 68fb4650497d6acbf6d407513cd2e2d960442e3b (patch) | |
| tree | 0c41cacd974ae9847dfcee977822f12e6d248baf /builtin-config.c | |
| parent | b658d50325c938d87d4891cb62e2eefb0b58a62c (diff) | |
| parent | b69ba460bb0710b2af8a20b4b0d62233f29401ec (diff) | |
Merge branch 'maint'
* maint:
config: Change output of --get-regexp for valueless keys
config: Complete documentation of --get-regexp
cleanup merge-base test script
Fix zero-object version-2 packs
Ignore submodule commits when fetching over dumb protocols
Diffstat (limited to 'builtin-config.c')
| -rw-r--r-- | builtin-config.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/builtin-config.c b/builtin-config.c index b2515f7e65..dbc2339d0f 100644 --- 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; - 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) |