completion: fix completing merge strategies on non-C locales

pclouds · gitster · commit 7cc763aaa3f3 · 2018-01-26T09:48:14.000-08:00
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 &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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/.*://

Original file line number	Diff line number	Diff line change
`@@ -594,7 +594,7 @@ __git_is_configured_remote ()`
`594`	`594`
`595`	`595`	`__git_list_merge_strategies ()`
`596`	`596`	`{`
`597`		`- git merge -s help 2>&1 \|`
	`597`	`+ LANG=C LC_ALL=C git merge -s help 2>&1 \|`
`598`	`598`	`sed -n -e '/[Aa]vailable strategies are: /,/^$/{`
`599`	`599`	`s/\.$//`
`600`	`600`	`s/.*://`