From: "SZEDER Gábor" <szeder@ira.uka.de>
To: git@vger.kernel.org
Cc: "Felipe Contreras" <felipe.contreras@gmail.com>,
"Jeff King" <peff@peff.net>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"SZEDER Gábor" <szeder@ira.uka.de>
Subject: [PATCH 4/7] completion: add tests for invalid variable name among completion words
Date: Sat, 17 Nov 2012 12:05:50 +0100 [thread overview]
Message-ID: <1353150353-29874-5-git-send-email-szeder@ira.uka.de> (raw)
In-Reply-To: <1353150353-29874-1-git-send-email-szeder@ira.uka.de>
The compgen Bash-builtin performs expansion on all words in the
wordlist given to its -W option, breaking Git's completion script in
various ways if one of those words can be expanded. The breakage can
be simply bogus possible completion words, but it can also be a
failure:
$ git branch '${foo.bar}'
$ git checkout <TAB>
bash: ${foo.bar}: bad substitution
${foo.bar} is an invalid variable name, which triggers the failure
when compgen attempts to expand it, completely breaking refs
completion. The same applies to e.g. completing the <tree>:<path>
notation when a filename contains a similar expandable substring.
Since both __gitcomp() and __gitcomp_nl() rely on compgen, both are
affected by this issue. So add a simple test for each of them to
check that such a word doesn't cause failures (but don't check the
resulting possible completion words for now, because that should be
quoted properly, and that's a separate topic).
Reported-by: Jeroen Meijer <jjgmeijer@hotmail.com>
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
t/t9902-completion.sh | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 32b3e8c4..a108ec1c 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -71,6 +71,7 @@ test_completion_long ()
}
newline=$'\n'
+invalid_variable_name="${foo.bar}"
test_expect_success '__gitcomp - trailing space - options' '
sed -e "s/Z$//" >expected <<-\EOF &&
@@ -155,6 +156,12 @@ test_expect_success '__gitcomp - suffix' '
test_cmp expected out
'
+test_expect_failure '__gitcomp - doesnt fail because of invalid variable name' '
+ (
+ __gitcomp "$invalid_variable_name"
+ )
+'
+
test_expect_success '__gitcomp_nl - trailing space' '
sed -e "s/Z$//" >expected <<-\EOF &&
maint Z
@@ -239,6 +246,12 @@ test_expect_success '__gitcomp_nl - no suffix' '
test_cmp expected out
'
+test_expect_failure '__gitcomp_nl - doesnt fail because of invalid variable name' '
+ (
+ __gitcomp_nl "$invalid_variable_name"
+ )
+'
+
test_expect_success 'basic' '
run_completion git "" &&
# built-in
--
1.8.0.220.g4d14ece
next prev parent reply other threads:[~2012-11-17 11:06 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-17 11:05 [PATCH 0/7] completion: fix expansion issues with compgen SZEDER Gábor
2012-11-17 11:05 ` [PATCH 1/7] completion: make the 'basic' test more tester-friendly SZEDER Gábor
2012-11-17 23:00 ` Jonathan Nieder
2012-11-18 9:38 ` Felipe Contreras
2012-11-18 9:39 ` Felipe Contreras
2012-11-17 11:05 ` [PATCH 2/7] completion: fix args of run_completion() test helper SZEDER Gábor
2012-11-17 23:02 ` Jonathan Nieder
2012-11-18 8:48 ` Felipe Contreras
2012-11-17 11:05 ` [PATCH 3/7] completion: add tests for the __gitcomp_nl() completion helper function SZEDER Gábor
2012-11-17 23:31 ` Jonathan Nieder
2012-11-18 8:53 ` Felipe Contreras
2012-11-17 11:05 ` SZEDER Gábor [this message]
2012-11-17 23:40 ` [PATCH 4/7] completion: add tests for invalid variable name among completion words Jonathan Nieder
2012-11-18 8:34 ` Felipe Contreras
2012-11-18 8:34 ` Felipe Contreras
2012-11-17 11:05 ` [PATCH 5/7] completion: fix expansion issues in __gitcomp_nl() SZEDER Gábor
2012-11-17 11:50 ` Felipe Contreras
2012-11-17 14:14 ` SZEDER Gábor
2012-11-17 19:08 ` Felipe Contreras
2012-11-17 19:28 ` Felipe Contreras
2012-11-18 0:55 ` Felipe Contreras
2012-11-18 0:58 ` Felipe Contreras
2012-11-17 11:05 ` [PATCH 6/7] completion: fix expansion issue in __gitcomp() SZEDER Gábor
2012-11-17 11:39 ` Felipe Contreras
2012-11-17 14:09 ` SZEDER Gábor
2012-11-17 11:05 ` [PATCH 7/7] completion: remove the now unused __gitcomp_1() internal helper function SZEDER Gábor
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=1353150353-29874-5-git-send-email-szeder@ira.uka.de \
--to=szeder@ira.uka.de \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.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).