From: Frank Lichtenheld <frank@lichtenheld.de>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <junkio@cox.net>,
Jakub Narebski <jnareb@gmail.com>,
Frank Lichtenheld <frank@lichtenheld.de>
Subject: [PATCH 2/3] config: Change output of --get-regexp for valueless keys
Date: Mon, 25 Jun 2007 16:03:54 +0200 [thread overview]
Message-ID: <11827802363555-git-send-email-frank@lichtenheld.de> (raw)
In-Reply-To: <200706220156.01175.jnareb@gmail.com>
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>
---
builtin-config.c | 8 ++++++--
t/t1300-repo-config.sh | 6 ++++++
2 files changed, 12 insertions(+), 2 deletions(-)
I hope that nobody depends on this specific behaviour.
Backwards compatibilty would be a pain here, since the --null
patch would get really complicated
diff --git a/builtin-config.c b/builtin-config.c
index b2515f7..dbc2339 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)
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 7731fa7..8b5e9fc 100755
--- 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 ^$'
+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' \
--
1.5.2.1
next prev parent reply other threads:[~2007-06-25 14:04 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-20 22:59 [RFC] Implementing git config handling in Git.pm Frank Lichtenheld
2007-05-20 23:14 ` Petr Baudis
2007-05-21 17:46 ` [PATCH] config: Add --quoted option to produce machine-parsable output Frank Lichtenheld
2007-05-21 18:03 ` Junio C Hamano
2007-05-21 18:46 ` Johannes Schindelin
2007-05-21 21:18 ` Junio C Hamano
2007-05-21 21:53 ` Johannes Schindelin
2007-05-21 19:54 ` Jan Hudec
2007-05-21 20:58 ` Frank Lichtenheld
2007-05-21 22:37 ` Jakub Narebski
2007-06-17 23:25 ` [PATCH/RFC] config: Add --null/-z option for null-delimted output Frank Lichtenheld
2007-06-19 0:55 ` Johannes Schindelin
2007-06-19 1:16 ` Jakub Narebski
2007-06-19 1:17 ` Frank Lichtenheld
2007-06-19 1:32 ` Johannes Schindelin
2007-06-19 1:37 ` Junio C Hamano
2007-06-19 2:12 ` Frank Lichtenheld
2007-06-19 11:09 ` Johannes Schindelin
2007-06-19 11:19 ` David Kastrup
2007-06-19 11:50 ` Jakub Narebski
2007-06-19 15:21 ` Frank Lichtenheld
2007-06-19 15:57 ` Johannes Schindelin
2007-06-19 17:26 ` Frank Lichtenheld
2007-06-20 10:31 ` Johannes Schindelin
2007-06-20 16:54 ` Jakub Narebski
2007-06-21 23:56 ` Jakub Narebski
2007-06-22 12:02 ` Frank Lichtenheld
2007-06-25 14:03 ` [PATCH 1/3] config: Complete documentation of --get-regexp Frank Lichtenheld
2007-06-25 14:03 ` Frank Lichtenheld [this message]
2007-06-27 2:14 ` [PATCH 2/3] config: Change output of --get-regexp for valueless keys Junio C Hamano
2007-06-25 14:03 ` [PATCH 3/3] config: Add --null/-z option for null-delimted output Frank Lichtenheld
2007-06-25 23:29 ` Jakub Narebski
2007-06-26 10:47 ` Frank Lichtenheld
2007-06-27 2:14 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11827802363555-git-send-email-frank@lichtenheld.de \
--to=frank@lichtenheld.de \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).