diff options
| author | Duy Nguyen <pclouds@gmail.com> | 2018-01-26 01:31:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-26 17:48:14 (GMT) |
| commit | 7cc763aaa3f39c62e0b2d5520e9d2bd8e4f3c4b3 (patch) | |
| tree | 039a0822b0da25c87e4432343c89cf4453784126 /contrib | |
| parent | 8279ed033f703d4115bee620dccd32a9ec94d9aa (diff) | |
| download | git-7cc763aaa3f39c62e0b2d5520e9d2bd8e4f3c4b3.zip git-7cc763aaa3f39c62e0b2d5520e9d2bd8e4f3c4b3.tar.gz git-7cc763aaa3f39c62e0b2d5520e9d2bd8e4f3c4b3.tar.bz2 | |
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>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 3683c77..88813e9 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/.*:// |