Re: [PATCH] merge: support --strategy '?' for git-completion.bash
- From
Duy Nguyen <pclouds@gmail.com>
- Date
- Jan 26, 2018, 01:31 UTC
- Message-ID
- <20180126013142.GA11346@duynguyen.dek-tpc.internal>
- In-Reply-To
- <xmqqo9lhai46.fsf@gitster.mtv.corp.google.com>
On Thu, Jan 25, 2018 at 10:49:45AM -0800, Junio C Hamano wrote:
Show 17 quoted lines
> Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes: > > > Bash completion support gets the list of available strategies with a > > grep and sed trick which does not work on non-C locale since the anchor > > string is translated and it does not cover custom strategies either. > > > > Let's do it a better way and make git-merge provide all available > > strategies in machine-readable form. > > > > Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> > > --- > > Another, perhaps better, option is add "git merge --list-strategies". > > It requires some code movement, so I'll try with a simpler approach > > first. > > If you run the probing "merge -s help" under C locale, that would > just be a one-liner, no ;-) I.e.
That was my first choice but I was worried that it failed to catch custom strategies which are preceded with a different anchor string "Available custom strategies are:".
I didn't look carefully at those sed magic. But it looks like it correctly handles this case too. So v2 follows below. It still feels dirty to do this kind of text manipulation though. But that can wait.
-- 8< -- Subject: [PATCH] completion: fix completing merge strategies on non-C locales
The anchor string "Available strategies are:" is translatable so __git_list_merge_strategies may fail to collect available strategies from 'git merge' on non-C locales. Force C locale on this command.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 3683c772c5..88813e9124 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -594,7 +594,7 @@ __git_is_configured_remote () __git_list_merge_strategies () { - git merge -s help 2>&1 | + LANG=C LC_ALL=C git merge -s help 2>&1 | sed -n -e '/[Aa]vailable strategies are: /,/^$/{ s/\.$// s/.*://
-- 2.16.1.196.g4f5118c359 -- 8< --