diff options
author | Barry Scott <barry@barrys-emacs.org> | 2016-05-29 13:59:53 +0100 |
---|---|---|
committer | Barry Scott <barry@barrys-emacs.org> | 2016-05-29 13:59:53 +0100 |
commit | 78f3f38d18fc88fd639af8a6c1ef757d2ffe51d6 (patch) | |
tree | 9098ad5f1beebb4eef62944e7b1458bdb4c840e0 /git/remote.py | |
parent | 5077fc7e4031e53f730676df4d8df5165b1d36cc (diff) | |
download | gitpython-78f3f38d18fc88fd639af8a6c1ef757d2ffe51d6.tar.gz |
Return stderr lines from a pull() call that fails
Diffstat (limited to 'git/remote.py')
-rw-r--r-- | git/remote.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git/remote.py b/git/remote.py index f23f50a2..1ef62409 100644 --- a/git/remote.py +++ b/git/remote.py @@ -646,6 +646,10 @@ class Remote(LazyMixin, Iterable): try: handle_process_output(proc, stdout_handler, progress_handler, finalize_process) + except GitCommandError as err: + # convert any error from wait() into the same error with stdout lines + raise GitCommandError( err.command, err.status, progress.get_stderr() ) + except Exception: if len(output) == 0: raise |