Commit 3894520a authored by Guido Günther's avatar Guido Günther

Add string vs. binary encoding/decoding

to support Python3
parent 18d83d52
......@@ -422,7 +422,7 @@ class GitRepository(object):
args.add(commit2)
sha1, stderr, ret = self._git_inout('merge-base', args.args, capture_stderr=True)
if not ret:
return self.strip_sha1(sha1)
return self.strip_sha1(sha1).decode('utf-8')
else:
raise GitRepositoryError("Failed to get common ancestor: %s" % stderr.strip())
......
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