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 0/7] completion: fix expansion issues with compgen
Date: Sat, 17 Nov 2012 12:05:46 +0100 [thread overview]
Message-ID: <1353150353-29874-1-git-send-email-szeder@ira.uka.de> (raw)
This series fixes the expansion issues with compgen reported by Jeroen
Meijer a while ago in
http://article.gmane.org/gmane.comp.version-control.git/201596
The problem is that the compgen Bash-builtin performs expansion on all
words in the wordlist given to its -W option, breaking Git's completion
script when e.g. refs or filenames contain expandable substrings. Since
compgen has no option to turn off this expansion and we only use a small
subset of compgen's functionality, this series replaces compgen in
__gitcomp() and __gitcomp_nl() by some shell logic and a small awk script,
respectively.
Patches 1 and 2 are test enhancements and fixes, while 3 and 4 add new
tests to make sure I don't break anything and to demonstrate the issues,
respectively. The actual bugfixes are in patches 5 and 6. Finally, patch
7 is a cleanup made possible by patch 6 (could be squashed into 6).
In the future we might want/need to fill COMPREPLY directly when
completing a path in the <tree>:<path> notation instead using
__gitcomp_nl() there, because paths can contain newlines, too.
Compared to Felipe's series from yesterday, this series has more tests,
more descriptive commit messages, and it's faster. However, it doesn't
include his 1/5 (completion: get rid of empty COMPREPLY assignments).
Footnote: check the patchlist below, and notice how format-patch put
patches 4 and 5 into the same line.
SZEDER Gábor (7):
completion: make the 'basic' test more tester-friendly
completion: fix args of run_completion() test helper
completion: add tests for the __gitcomp_nl() completion helper
function
completion: add tests for invalid variable name among completion words completion: fix expansion issues in __gitcomp_nl()
completion: fix expansion issue in __gitcomp()
completion: remove the now unused __gitcomp_1() internal helper
function
contrib/completion/git-completion.bash | 57 ++++++++-------
t/t9902-completion.sh | 123 ++++++++++++++++++++++++++++++---
2 files changed, 147 insertions(+), 33 deletions(-)
--
1.8.0.220.g4d14ece
next 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 SZEDER Gábor [this message]
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 ` [PATCH 4/7] completion: add tests for invalid variable name among completion words SZEDER Gábor
2012-11-17 23:40 ` 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-1-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).