diff options
author | Sebastian Thiel <sthiel@thoughtworks.com> | 2019-07-20 18:12:27 +0800 |
---|---|---|
committer | Sebastian Thiel <sthiel@thoughtworks.com> | 2019-07-20 18:12:27 +0800 |
commit | 9b628dccf4102d2a63c6fc8cd957ab1293bafbc6 (patch) | |
tree | 438877524d3aad2d5c4a5abc2f7109ce90f39906 /git/util.py | |
parent | 3bf002e3ccc26ec99e8ada726b8739975cd5640e (diff) | |
download | gitpython-9b628dccf4102d2a63c6fc8cd957ab1293bafbc6.tar.gz |
Revert "Revert "Implement update call when the object is "up to date" #871""
This reverts commit 3bf002e3ccc26ec99e8ada726b8739975cd5640e.
Try again
Diffstat (limited to 'git/util.py')
-rw-r--r-- | git/util.py | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/git/util.py b/git/util.py index 3ba58857..b0fdc79f 100644 --- a/git/util.py +++ b/git/util.py @@ -390,6 +390,21 @@ class RemoteProgress(object): if len(self.error_lines) > 0 or self._cur_line.startswith(('error:', 'fatal:')): self.error_lines.append(self._cur_line) return [] + elif 'up to date' in self._cur_line: + # Checking this way instead of startswith, because debugging for + # startswith(' = [up to date]') is going to be a major pain if just + # a single space or bracket changes. + + # Strip the initial ' = [up to date]' from the line + message_string = line.split('date]', 1)[-1] + + # Trim whitespace + message_string = ' '.join(message_string.split()) + + self.update(0, + 1, + 1, + message_string) sub_lines = line.split('\r') failed_lines = [] |