Skip to content

The progress arg to push, pull, fetch and clone is now a python calla… #450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 29, 2016
Merged

The progress arg to push, pull, fetch and clone is now a python calla… #450

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4492c7
The progress arg to push, pull, fetch and clone is now a python calla…
barry-scott May 28, 2016
d255f4c
Merge remote-tracking branch 'upstream/master'
barry-scott May 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge remote-tracking branch 'upstream/master'
  • Loading branch information
@barry-scott
barry-scott committed May 28, 2016
commit d255f4c8fd905d1cd12bd42b542953d54ac8a8c3
10 changes: 6 additions & 4 deletions git/remote.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,8 +684,8 @@ def fetch(self, refspec=None, progress=None, **kwargs):
else:
args = [refspec]

proc = self.repo.git.fetch(self, *args, as_process=True, with_stdout=False, v=True,
**kwargs)
proc = self.repo.git.fetch(self, *args, as_process=True, with_stdout=False,
universal_newlines=True, v=True, **kwargs)
res = self._get_fetch_info_from_stderr(proc, progress)
if hasattr(self.repo.odb, 'update_cache'):
self.repo.odb.update_cache()
Expand All @@ -703,7 +703,8 @@ def pull(self, refspec=None, progress=None, **kwargs):
# No argument refspec, then ensure the repo's config has a fetch refspec.
self._assert_refspec()
kwargs = add_progress(kwargs, self.repo.git, progress)
proc = self.repo.git.pull(self, refspec, with_stdout=False, as_process=True, v=True, **kwargs)
proc = self.repo.git.pull(self, refspec, with_stdout=False, as_process=True,
universal_newlines=True, v=True, **kwargs)
res = self._get_fetch_info_from_stderr(proc, progress)
if hasattr(self.repo.odb, 'update_cache'):
self.repo.odb.update_cache()
Expand Down Expand Up @@ -744,7 +745,8 @@ def push(self, refspec=None, progress=None, **kwargs):
If the operation fails completely, the length of the returned IterableList will
be null."""
kwargs = add_progress(kwargs, self.repo.git, progress)
proc = self.repo.git.push(self, refspec, porcelain=True, as_process=True, **kwargs)
proc = self.repo.git.push(self, refspec, porcelain=True, as_process=True,
universal_newlines=True, **kwargs)
return self._get_push_info(proc, progress)

@property
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.