From a7e048fd444a6d87499f35abfb579b51fa36f6a2 Mon Sep 17 00:00:00 2001 From: Markus Siemens Date: Sat, 13 Apr 2013 17:03:32 +0200 Subject: [PATCH] Fixed error output when rebasing fails --- PyGitUp/git_wrapper.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyGitUp/git_wrapper.py b/PyGitUp/git_wrapper.py index 33d0490..b662e5e 100644 --- a/PyGitUp/git_wrapper.py +++ b/PyGitUp/git_wrapper.py @@ -162,7 +162,7 @@ def rebase(self, target_branch): (self.config('rebase.arguments') or []) + [target_branch.name] ) try: - self.git.rebase(*arguments) + self.run('rebase', *arguments) except GitCommandError as e: raise RebaseError(current_branch.name, target_branch.name, **e.__dict__) @@ -207,6 +207,9 @@ def __init__(self, stderr=None, stdout=None, details=None, message=None): self.details = details self.message = message + def __str__(self): + return self.message + class UnstashError(GitError): """