summaryrefslogtreecommitdiff
path: root/git/repo/base.py
diff options
context:
space:
mode:
Diffstat (limited to 'git/repo/base.py')
-rw-r--r--git/repo/base.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/git/repo/base.py b/git/repo/base.py
index 104261dd..a23e767a 100644
--- a/git/repo/base.py
+++ b/git/repo/base.py
@@ -403,7 +403,7 @@ class Repo(object):
"""
:return:
GitConfigParser allowing to write values of the specified configuration file level.
- Config writers should be retrieved, used to change the configuration ,and written
+ Config writers should be retrieved, used to change the configuration, and written
right away as they will lock the configuration file in question and prevent other's
to write it.
@@ -827,8 +827,8 @@ class Repo(object):
if progress:
handle_process_output(proc, None, progress.new_message_handler(), finalize_process)
else:
- proc.communicate()
- finalize_process(proc)
+ (stdout, stderr) = proc.communicate()
+ finalize_process(proc, stderr=stderr)
# end handle progress
finally:
if prev_cwd is not None: