Merge pull request #198 from folti/0.3

GitRunCommand exception can store stdout output too.

1 files changed, 7 insertions, 3 deletions

diff --git a/git/exc.py b/git/exc.py
index 3b3091e2..76d3d486 100644
--- a/git/exc.py
+++ b/git/exc.py
@@ -17,14 +17,18 @@ class NoSuchPathError(OSError):
 
 class GitCommandError(Exception):
     """ Thrown if execution of the git command fails with non-zero status code. """
-    def __init__(self, command, status, stderr=None):
+    def __init__(self, command, status, stderr=None, stdout=None):
         self.stderr = stderr
+        self.stdout = stdout
         self.status = status
         self.command = command
         
     def __str__(self):
-        return ("'%s' returned exit status %i: %s" %
-                    (' '.join(str(i) for i in self.command), self.status, self.stderr))
+        ret = "'%s' returned exit status %i: %s" % \
+              (' '.join(str(i) for i in self.command), self.status, self.stderr)
+        if self.stdout is not None:
+            ret += "\nstdout: %s" % self.stdout
+        return ret
 
 
 class CheckoutError( Exception ):