From: "SZEDER Gábor" <szeder@ira.uka.de>
To: Jeff King <peff@peff.net>
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: [POC PATCH 5/5] completion: avoid compgen to fix expansion issues in __gitcomp_nl()
Date: Fri, 28 Sep 2012 17:08:52 +0200 [thread overview]
Message-ID: <20120928150852.GA13081@goldbirke> (raw)
In-Reply-To: <1348826975-2225-5-git-send-email-szeder@ira.uka.de>
On Fri, Sep 28, 2012 at 12:09:35PM +0200, SZEDER Gábor wrote:
> __gitcomp_nl ()
> {
> local IFS=$'\n'
> - COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
> + COMPREPLY=($(echo "$1" |sed -n "/^${3-$cur}/ {
$cur can be a path, so it can contain /, which then breaks this sed
expression. Here's a fixup:
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 2df865fd..d30f376f 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -260,8 +260,8 @@ __gitcomp ()
# appended.
__gitcomp_nl ()
{
- local IFS=$'\n'
- COMPREPLY=($(echo "$1" |sed -n "/^${3-$cur}/ {
+ local IFS=$'\n' cur_=${3-$cur}
+ COMPREPLY=($(echo "$1" |sed -n "/^${cur_//\//\\/}/ {
s/^/${2-}/
s/$/${4- }/
p
--
1.7.12.1.490.g14283db
next prev parent reply other threads:[~2012-09-28 15:09 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-20 2:15 [PATCH] completion: fix shell expansion of items Felipe Contreras
2012-09-20 1:46 ` Jeff King
2012-09-20 16:52 ` Junio C Hamano
2012-09-20 18:11 ` SZEDER Gábor
2012-09-20 18:21 ` Jeff King
2012-09-20 19:38 ` Felipe Contreras
2012-09-25 4:31 ` [PATCH] Revert "completion: fix shell expansion of items" Jeff King
2012-09-25 16:03 ` Junio C Hamano
2012-09-25 22:37 ` SZEDER Gábor
2012-09-25 23:28 ` Junio C Hamano
2012-09-26 21:46 ` Jeff King
2012-09-26 21:47 ` [PATCH 1/3] t9902: add a few basic completion tests Jeff King
2012-09-26 21:51 ` [PATCH 2/3] t9902: add completion tests for "odd" filenames Jeff King
2012-09-26 21:51 ` [PATCH 3/3] completion: improve shell expansion of items Jeff King
2012-09-26 21:57 ` [PATCH 4/3] completion: quote completions we find Jeff King
2012-09-27 21:40 ` SZEDER Gábor
2012-09-27 22:31 ` Junio C Hamano
2012-09-27 22:58 ` SZEDER Gábor
2012-09-27 0:37 ` [PATCH 3/3] completion: improve shell expansion of items SZEDER Gábor
2012-09-27 6:28 ` Jeff King
2012-09-27 6:43 ` Jeff King
2012-09-27 19:48 ` Jeff King
2012-09-28 10:05 ` SZEDER Gábor
2012-09-28 10:09 ` [PATCH 1/5] completion: fix non-critical bugs in __gitcomp() tests SZEDER Gábor
2012-09-28 10:09 ` [PATCH 2/5] completion: fix args of run_completion() test helper SZEDER Gábor
2012-09-28 18:04 ` Junio C Hamano
2012-09-28 18:38 ` SZEDER Gábor
2012-09-28 19:23 ` Junio C Hamano
2012-09-28 19:30 ` Jeff King
2012-09-28 19:49 ` Junio C Hamano
2012-09-28 19:55 ` Jeff King
2012-09-28 20:28 ` SZEDER Gábor
2012-09-28 10:09 ` [PATCH 3/5] completion: add tests for the __gitcomp_nl() completion helper function SZEDER Gábor
2012-09-28 10:09 ` [PATCH 4/5] completion: test __gitcomp() and __gitcomp_nl() with expandable words SZEDER Gábor
2012-09-28 10:09 ` [POC PATCH 5/5] completion: avoid compgen to fix expansion issues in __gitcomp_nl() SZEDER Gábor
2012-09-28 15:08 ` SZEDER Gábor [this message]
2012-09-28 15:46 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120928150852.GA13081@goldbirke \
--to=szeder@ira.uka.de \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).