Skip to content

O
oh-my-zsh
Commit 3c8f73c3 authored by Marc Cornellà's avatar Marc Cornellà
Browse files
Options

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.
parent 7824dc63
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
plugins/git-prompt/gitstatus.py
View file @ 3c8f73c3
#!/usr/bin/env python #!/usr/bin/env python
from __future__ import print_function from __future__ import print_function
import os
import sys import sys
import re import re
import shlex import shlex
...@@ -30,7 +31,7 @@ def get_tagname_or_hash(): ...@@ -30,7 +31,7 @@ def get_tagname_or_hash():
# `git status --porcelain --branch` can collect all information # `git status --porcelain --branch` can collect all information
# branch, remote_branch, untracked, staged, changed, conflicts, ahead, behind # 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() stdout, sterr = po.communicate()
if po.returncode != 0: if po.returncode != 0:
sys.exit(0) # Not a git repository sys.exit(0) # Not a git repository
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment