aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2015-05-27 09:19:35 +0200
committerGuido Günther <agx@sigxcpu.org>2015-05-27 12:16:09 +0200
commit3894520a859995c6c4fea4761ec377918a01cf8c (patch)
tree14527d464ff8dee15ddee7ff2707f055caad2758
parent18d83d5273cb0764d66170a90033219b4e96e05b (diff)
Add string vs. binary encoding/decoding
to support Python3
-rw-r--r--gbp/git/repository.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index 3b208bf4..8adaa612 100644
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -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())