| Index: git_common.py
|
| diff --git a/git_common.py b/git_common.py
|
| index 99ed53cc45608e80648414f85a3591300013f76b..7f2e13b62ee4f1620b76271382cd72ccc57ca303 100644
|
| --- a/git_common.py
|
| +++ b/git_common.py
|
| @@ -497,7 +497,7 @@ def parse_commitrefs(*commitrefs):
|
| raise BadCommitRefException(commitrefs)
|
|
|
|
|
| -RebaseRet = collections.namedtuple('RebaseRet', 'success message')
|
| +RebaseRet = collections.namedtuple('RebaseRet', 'success stdout stderr')
|
|
|
|
|
| def rebase(parent, start, branch, abort=False):
|
| @@ -521,11 +521,11 @@ def rebase(parent, start, branch, abort=False):
|
| if TEST_MODE:
|
| args.insert(0, '--committer-date-is-author-date')
|
| run('rebase', *args)
|
| - return RebaseRet(True, '')
|
| + return RebaseRet(True, '', '')
|
| except subprocess2.CalledProcessError as cpe:
|
| if abort:
|
| run('rebase', '--abort')
|
| - return RebaseRet(False, cpe.stdout)
|
| + return RebaseRet(False, cpe.stdout, cpe.stderr)
|
|
|
|
|
| def remove_merge_base(branch):
|
|
|