Merge pull request #198 from folti/0.3

Byron · Byron · commit 678821a036c0 · 2014-11-12T09:24:55.000+01:00
GitRunCommand exception can store stdout output too.
diff --git a/git/cmd.py b/git/cmd.py
@@ -380,7 +380,10 @@ def execute(self, command,
         # END handle debug printing
 
         if with_exceptions and status != 0:
-            raise GitCommandError(command, status, stderr_value)
+            if with_extended_output:
+                raise GitCommandError(command, status, stderr_value, stdout_value)
+            else:
+                raise GitCommandError(command, status, stderr_value)
 
         # Allow access to the command's status code
         if with_extended_output:
diff --git 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 ):
