Skip to content

Commit

Permalink
Fixed error output when rebasing fails
Browse files Browse the repository at this point in the history
  • Loading branch information
msiemens committed Apr 13, 2013
1 parent 26911a2 commit a7e048f
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion PyGitUp/git_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down Expand Up @@ -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):
"""
Expand Down

0 comments on commit a7e048f

Please # to comment.