Merge branch 'nd/list-merge-strategy' into maint

gitster · gitster · commit 091853a1aad7 · 2018-03-22T14:24:11.000-07:00
Completion of "git merge -s&lt;strategy&gt;" (in contrib/) did not work
well in non-C locale.

* nd/list-merge-strategy:
  completion: fix completing merge strategies on non-C locales
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/.*://`