aboutsummaryrefslogtreecommitdiffhomepage
path: root/gbp
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2013-04-08 11:05:32 +0200
committerGuido Günther <agx@sigxcpu.org>2013-04-08 11:11:42 +0200
commitb05d4097b6ab8dcc98343dcd33c0d50e63b88118 (patch)
treeb9381fa25f364a68cfa8add14e6314940e1053a4 /gbp
parent3d6b68ae541d6020ff747628b3e44196999e0a50 (diff)
Revert "GitRepository.show: use _git_inout()"
This changes the newline behaviour. readlines() as used by _git_getoutput correctly keeps the newlines while this change doesn't. This reverts commit 92edb4eda14cf4b5fd1514feb7b81aa50456285c.
Diffstat (limited to 'gbp')
-rw-r--r--gbp/git/repository.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index bf328946..9dd47487 100644
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -1287,10 +1287,9 @@ class GitRepository(object):
def show(self, id):
"""git-show id"""
- commit, stderr, ret = self._git_inout('show', ["--pretty=medium", id],
- capture_stderr=True)
+ commit, ret = self._git_getoutput('show', [ "--pretty=medium", id ])
if ret:
- raise GitRepositoryError("can't get %s: %s" % (id, stderr))
+ raise GitRepositoryError("can't get %s" % id)
for line in commit:
yield line