From 3cfcf5e0aa71bddcf7ab45d3880f142654f22266 Mon Sep 17 00:00:00 2001 From: sheveko <28670374+sheveko@users.noreply.github.com> Date: Sun, 7 Apr 2019 20:21:54 +0200 Subject: git-prompt: run git status with LANG=C (#6087) As described in #6086 there will be an error when one set another language than English. --- plugins/git-prompt/gitstatus.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/git-prompt/gitstatus.py') diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py index a4d07cde6..5243af23c 100644 --- a/plugins/git-prompt/gitstatus.py +++ b/plugins/git-prompt/gitstatus.py @@ -30,7 +30,7 @@ def get_tagname_or_hash(): # `git status --porcelain --branch` can collect all information # branch, remote_branch, untracked, staged, changed, conflicts, ahead, behind -po = Popen(['git', 'status', '--porcelain', '--branch'], stdout=PIPE, stderr=PIPE) +po = Popen(['git', 'status', '--porcelain', '--branch'], env={"LANG": "C"}, stdout=PIPE, stderr=PIPE) stdout, sterr = po.communicate() if po.returncode != 0: sys.exit(0) # Not a git repository -- cgit v1.2.3-70-g09d2 From 3c8f73c312d1639826a3a5cc499197f423508833 Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Wed, 10 Apr 2019 20:30:30 +0200 Subject: git-prompt: fix LANG override for git status call The previous version modified the whole environment leading to problems (see #7757). This version *adds* LANG=C to the current env, without overriding it completely. Fixes #7757. --- plugins/git-prompt/gitstatus.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins/git-prompt/gitstatus.py') diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py index 5243af23c..390a50a6f 100644 --- a/plugins/git-prompt/gitstatus.py +++ b/plugins/git-prompt/gitstatus.py @@ -1,6 +1,7 @@ #!/usr/bin/env python from __future__ import print_function +import os import sys import re import shlex @@ -30,7 +31,7 @@ def get_tagname_or_hash(): # `git status --porcelain --branch` can collect all information # branch, remote_branch, untracked, staged, changed, conflicts, ahead, behind -po = Popen(['git', 'status', '--porcelain', '--branch'], env={"LANG": "C"}, stdout=PIPE, stderr=PIPE) +po = Popen(['git', 'status', '--porcelain', '--branch'], env=dict(os.environ, LANG="C"), stdout=PIPE, stderr=PIPE) stdout, sterr = po.communicate() if po.returncode != 0: sys.exit(0) # Not a git repository -- cgit v1.2.3-70-g09d2