From: Duy Nguyen <pclouds@gmail.com>
Date: Fri, 26 Jan 2018 01:31:42 +0000 (+0700)
Subject: completion: fix completing merge strategies on non-C locales
X-Git-Tag: v2.16.3~27^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7cc763aaa3f39c62e0b2d5520e9d2bd8e4f3c4b3?ds=inline

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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/.*://