diff options
| author | Yobmod <yobmod@gmail.com> | 2021-06-17 17:29:37 +0100 |
|---|---|---|
| committer | Yobmod <yobmod@gmail.com> | 2021-06-17 17:29:37 +0100 |
| commit | 636f77bf8d58a482df0bde8c0a6a8828950a0788 (patch) | |
| tree | e1207dbe034f82deacbb76369716779608e7056d /git/util.py | |
| parent | 567c892322776756e8d0095e89f39b25b9b01bc2 (diff) | |
| parent | b0f79c58ad919e90261d1e332df79a4ad0bc40de (diff) | |
| download | gitpython-636f77bf8d58a482df0bde8c0a6a8828950a0788.tar.gz | |
fix conflict
Diffstat (limited to 'git/util.py')
| -rw-r--r-- | git/util.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git/util.py b/git/util.py index 76aaee49..edbd5f1e 100644 --- a/git/util.py +++ b/git/util.py @@ -470,7 +470,7 @@ class RemoteProgress(object): line_str = line self._cur_line = line_str - if self.error_lines or self._cur_line.startswith(('error:', 'fatal:')): + if self._cur_line.startswith(('error:', 'fatal:')): self.error_lines.append(self._cur_line) return |