Permalink
Browse files

Merge fix from Chris to hide unpacking objects from git during tests.

  • Loading branch information...
2 parents 9246413 + c653319 commit 883b904fcd2ecf7718f4654322ea4fb776c15e97 @jelmer committed Nov 30, 2011
Showing with 8 additions and 2 deletions.
  1. +1 −0 AUTHORS
  2. +6 −1 dulwich/client.py
  3. +1 −1 dulwich/tests/compat/test_client.py
View
1 AUTHORS
@@ -2,6 +2,7 @@ Jelmer Vernooij <jelmer@samba.org>
James Westby <jw+debian@jameswestby.net>
John Carr <john.carr@unrouted.co.uk>
Dave Borowitz <dborowitz@google.com>
+Chris Eberle <eberle1080@gmail.com>
Hervé Cauwelier <herve@itaapy.com> wrote the original tutorial.
View
7 dulwich/client.py
@@ -524,14 +524,19 @@ class SubprocessGitClient(TraditionalGitClient):
def __init__(self, *args, **kwargs):
self._connection = None
+ self._stderr = None
+ self._stderr = kwargs.get('stderr')
+ if 'stderr' in kwargs:
+ del kwargs['stderr']
GitClient.__init__(self, *args, **kwargs)
def _connect(self, service, path):
import subprocess
argv = ['git', service, path]
p = SubprocessWrapper(
subprocess.Popen(argv, bufsize=0, stdin=subprocess.PIPE,
- stdout=subprocess.PIPE))
+ stdout=subprocess.PIPE,
+ stderr=self._stderr))
return Protocol(p.read, p.write,
report_activity=self._report_activity), p.can_read
View
2 dulwich/tests/compat/test_client.py
@@ -272,7 +272,7 @@ def tearDown(self):
CompatTestCase.tearDown(self)
def _client(self):
- return client.SubprocessGitClient()
+ return client.SubprocessGitClient(stderr=subprocess.PIPE)
def _build_path(self, path):
return self.gitroot + path

0 comments on commit 883b904

Please sign in to comment.