summaryrefslogtreecommitdiff
path: root/git/util.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-01-20 20:56:33 +0100
committerSebastian Thiel <byronimo@gmail.com>2015-01-20 20:56:33 +0100
commit9fbae711b76a4f2fa9345f43da6d2cdedd75d6c3 (patch)
treee203a3ea4ab21dc4db72e7df3ec52237e7cd65ae /git/util.py
parentea29541e213df928d356b3c12d4d074001395d3c (diff)
downloadgitpython-9fbae711b76a4f2fa9345f43da6d2cdedd75d6c3.tar.gz
Greatly improved possible safety of Submodule.update(), which is used by default.
Previously, the implementation would gladly reset new commits in submodules, and/or reset a dirty working tree. Now the new force_reset/force flag has to be specified explicitly to get back to the old behaviour. All submodule tests except for one are working.
Diffstat (limited to 'git/util.py')
-rw-r--r--git/util.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/git/util.py b/git/util.py
index 5385455a..8cab0b99 100644
--- a/git/util.py
+++ b/git/util.py
@@ -251,7 +251,10 @@ class RemoteProgress(object):
message = message[:-len(done_token)]
# END end message handling
- self.update(op_code, cur_count, max_count, message)
+ self.update(op_code,
+ cur_count and float(cur_count),
+ max_count and float(max_count),
+ message)
# END for each sub line
return failed_lines