Merge pull request #2 from pkok/master

When no upstream is configured, the script behaves as if push.default=current
13 years ago · 48eff2e073
parent 392aa36113 7d1a6e495e
commit 48eff2e073
1 changed files with 20 additions and 16 deletions
--- a/gitstatus.py
+++ b/gitstatus.py
@ -46,6 +46,10 @@ else:
 	remote_name = Popen(['git','config','branch.%s.remote' % branch], stdout=PIPE).communicate()[0].strip()
 	if remote_name:
 		merge_name = Popen(['git','config','branch.%s.merge' % branch], stdout=PIPE).communicate()[0].strip()
+	else:
+		remote_name = "origin"
+		merge_name = "refs/heads/%s" % branch
+
 	if remote_name == '.': # local
 		remote_ref = merge_name
 	else: