diff options
| author | JJ Graham <thetwoj@gmail.com> | 2019-10-23 20:28:08 -0500 |
|---|---|---|
| committer | Sebastian Thiel <sebastian.thiel@icloud.com> | 2019-10-24 09:52:58 +0200 |
| commit | d85574e0f37e82e266a7c56e4a3ded9e9c76d8a6 (patch) | |
| tree | f6d8cbbcd4d50f822f37672bffbba6994c322aa2 /git | |
| parent | 6244c55e8cbe7b039780cf7585be85081345b480 (diff) | |
| download | gitpython-d85574e0f37e82e266a7c56e4a3ded9e9c76d8a6.tar.gz | |
Fix #820
Diffstat (limited to 'git')
| -rw-r--r-- | git/remote.py | 4 | ||||
| -rw-r--r-- | git/test/test_remote.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/git/remote.py b/git/remote.py index 23337a9c..05d7d0db 100644 --- a/git/remote.py +++ b/git/remote.py @@ -717,7 +717,7 @@ class Remote(LazyMixin, Iterable): # read the lines manually as it will use carriage returns between the messages # to override the previous one. This is why we read the bytes manually progress_handler = progress.new_message_handler() - output = IterableList('name') + output = [] def stdout_handler(line): try: @@ -833,7 +833,7 @@ class Remote(LazyMixin, Iterable): :note: No further progress information is returned after push returns. :param kwargs: Additional arguments to be passed to git-push :return: - IterableList(PushInfo, ...) iterable list of PushInfo instances, each + list(PushInfo, ...) list of PushInfo instances, each one informing about an individual head which had been updated on the remote side. If the push contains rejected heads, these will have the PushInfo.ERROR bit set diff --git a/git/test/test_remote.py b/git/test/test_remote.py index 95898f12..f6ef3dbd 100644 --- a/git/test/test_remote.py +++ b/git/test/test_remote.py @@ -325,7 +325,7 @@ class TestRemote(TestBase): self._commit_random_file(rw_repo) progress = TestRemoteProgress() res = remote.push(lhead.reference, progress) - self.assertIsInstance(res, IterableList) + self.assertIsInstance(res, list) self._do_test_push_result(res, remote) progress.make_assertion() |