From: Jeff King <peff@peff.net>
To: "SZEDER Gábor" <szeder@ira.uka.de>
Cc: Felipe Contreras <felipe.contreras@gmail.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] completion: fix shell expansion of items
Date: Thu, 20 Sep 2012 14:21:04 -0400 [thread overview]
Message-ID: <20120920182104.GB19204@sigill.intra.peff.net> (raw)
In-Reply-To: <20120920181152.GA4689@goldbirke>
On Thu, Sep 20, 2012 at 08:11:52PM +0200, SZEDER Gábor wrote:
> > > In order to achieve that I took bash-completion's quote() function,
> > > which is rather simple, and renamed it to __git_quote() as per Jeff
> > > King's suggestion.
> > >
> > > Solves the original problem for me.
> >
> > Me too. Thanks.
>
> While it solves the original problem, it seems to break refs
> completion, as demonstrated by the following POC test:
>
> diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
> index 92d7eb47..fab63b95 100755
> --- a/t/t9902-completion.sh
> +++ b/t/t9902-completion.sh
> @@ -228,4 +228,11 @@ test_expect_success 'general options plus command' '
> test_completion "git --no-replace-objects check" "checkout "
> '
>
> +test_expect_success 'basic refs completion' '
> + touch file &&
> + git add file &&
> + git commit -m initial &&
> + test_completion "git branch m" "master "
> +'
Hmm. I notice that Felipe's patch wraps the _whole_ input to
__gitcomp_nl in single quotes. So if there are multiple completions we
would end up with:
'one
two
quo\'ted
three'
I wonder if that is OK to feed to compgen -W, or if it wants to expand
it line-by-line. Just guessing at this point, though.
-Peff
> +
> test_done
> --
> 1.7.12.1.438.g7dfa67b
>
>
> which fails with:
>
> --- expected 2012-09-20 18:05:23.857752925 +0000
> +++ out 2012-09-20 18:05:23.877752925 +0000
> @@ -1 +1 @@
> -master
> +
>
next prev parent reply other threads:[~2012-09-20 18:21 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 [this message]
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
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=20120920182104.GB19204@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder@ira.uka.de \
/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).