Skip to content

Commit

Permalink
Merge tag 'v1.1.1' into v2.x.x
Browse files Browse the repository at this point in the history
Version 1.1.1

* tag 'v1.1.1':
  Update release notes
  Fix unicode in PR title or description
  • Loading branch information
llucax committed Oct 31, 2020
2 parents 66fd0e4 + 781f4f2 commit 34c4ff1
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions git-hub
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ issues) to be carried out directly from the command line.

VERSION = "git-hub devel"

import io
import re
import sys
import time
Expand Down Expand Up @@ -324,13 +325,12 @@ def git_toplevel_dir():
def editor(help_msg, msg=None):
prog = git('var', 'GIT_EDITOR')
fname = os.path.join(git_dir(), 'HUB_EDITMSG')
with open(fname, 'w') as f:
f.write(msg or '')
f.write(help_msg)
with io.open(fname, 'w') as f:
f.write(u''.join([msg or '', help_msg]))
status = subprocess.call([prog + ' "$@"', prog, fname], shell=True)
if status != 0:
die("Editor returned {}, aborting...", status)
with open(fname) as f:
with io.open(fname) as f:
msg = f.read()
return msg

Expand Down

0 comments on commit 34c4ff1

Please sign in to comment.