From a13b7a9d77a4e25558adcfcbf690db84a4669138 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 4 May 2015 13:07:14 -0400 Subject: [PATCH] Push language override down into the cmd wrapper There are more things that break if we run git with i18n on. Make sure that we always set LANG and LANGUAGE to C so that we get predictable output. Change-Id: I1bf1124f0b09d6658a7b0703e3b9e74ed80f4eea --- git_review/cmd.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/git_review/cmd.py b/git_review/cmd.py index efcd549..f354a75 100755 --- a/git_review/cmd.py +++ b/git_review/cmd.py @@ -133,6 +133,8 @@ def run_command_status(*argv, **kwargs): argv = shlex.split(str(argv[0])) stdin = kwargs.pop('stdin', None) newenv = os.environ.copy() + newenv['LANG'] = 'C' + newenv['LANGUAGE'] = 'C' newenv.update(kwargs) p = subprocess.Popen(argv, stdin=subprocess.PIPE if stdin else None, @@ -814,7 +816,7 @@ def get_branch_name(target_branch): has_color = check_color_support() if has_color: cmd += " --color=never" - for branch in run_command(cmd, LANG='C').split("\n"): + for branch in run_command(cmd).split("\n"): if branch.startswith('*'): _branch_name = branch.split()[1].strip() break