aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2015-01-13 10:57:08 +0100
committerAlberto Bertogli <albertito@blitiri.com.ar>2015-01-13 20:51:44 +0100
commit6b83e32bc1cc6adb831631e30de59b026971534a (patch)
tree3d2010328f474c69225f2f4aa3e14513c11ceccc
parent43f4132bf1e7855f17187f3f496b62a0a8192424 (diff)
downloadgit-arr-fork-6b83e32bc1cc6adb831631e30de59b026971534a.zip
Repo.blob: employ formal mechanism for requesting raw command output
Sneakily extracting the raw 'fd' from the utf8-encoding wrapper returned by GitCommand.run() is ugly and fragile. Instead, take advantage of the new formal API for requesting raw command output. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Alberto Bertogli <albertito@blitiri.com.ar>
-rw-r--r--git.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/git.py b/git.py
index 718d2fa..58b0c4c 100644
--- a/git.py
+++ b/git.py
@@ -344,6 +344,7 @@ class Repo:
if not ref:
ref = self.branch
cmd = self.cmd('cat-file')
+ cmd.raw(raw)
cmd.batch = None
if isinstance(ref, unicode):
@@ -355,10 +356,6 @@ class Repo:
if not head or head.strip().endswith('missing'):
return None
- # Raw option in case we need a binary blob and not a utf-8 encoded one.
- if raw:
- return out.fd.read()
-
return out.read()
def last_commit_timestamp(self):