adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix(plugins/git-prompt): Fix accentued branch names support

Browse Source
This commit is contained in:
Arnaud Thimel 2016-02-25 16:50:51 +01:00
parent 027704ec55
commit c08c39c29f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/git-prompt/gitstatus.py
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: UTF-8 -*-
from __future__ import print_function from __future__ import print_function
import sys import sys
@ -50,7 +51,10 @@ if po.returncode != 0:
# collect git status information # collect git status information
untracked, staged, changed, conflicts = [], [], [], [] untracked, staged, changed, conflicts = [], [], [], []
ahead, behind = 0, 0 ahead, behind = 0, 0
status = [(line[0], line[1], line[2:]) for line in stdout.decode('utf-8').splitlines()] # Remove « .decode('utf-8') » because it breaks status line if an accent (e.g.: « é ») is present.
# For example, with .decode('utf-8'), git-prompt does not display with this kind of branch name: « feature/8113_liens_supplémentaires »
# was: « status = [(line[0], line[1], line[2:]) for line in stdout.decode('utf-8').splitlines()] »
status = [(line[0], line[1], line[2:]) for line in stdout.splitlines()]
for st in status: for st in status:
if st[0] == '#' and st[1] == '#': if st[0] == '#' and st[1] == '#':
if re.search('Initial commit on', st[2]): if re.search('Initial commit on', st[2]):