From 8a2060598b0f2a50093dc67aae6d96a743d8823a Mon Sep 17 00:00:00 2001 From: Martin Gondermann Date: Sat, 15 Dec 2012 14:49:50 +0100 Subject: [PATCH] branch is now shown correctly (not b'branchname' anymore) --- gitstatus.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitstatus.py b/gitstatus.py index b69742e7..a8dd009a 100755 --- a/gitstatus.py +++ b/gitstatus.py @@ -17,7 +17,7 @@ if 'fatal: Not a git repository' in error_string: sys.exit(0) -branch = branch.strip()[11:] +branch = branch.decode('utf-8').strip()[11:] res, err = Popen(['git','diff','--name-status'], stdout=PIPE, stderr=PIPE).communicate() err_string = err.decode('utf-8') @@ -66,8 +66,8 @@ remote = '.' out = '\n'.join([ - str(branch), - remote, + str(branch), + str(remote), staged, conflicts, changed,