Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit a527224

Browse filesBrowse files
authored
Merge pull request #1971 from fvalette-ledger/fix-fetch-progress-bar
Fix Fetch progress bar
2 parents 49ca909 + d6cdb67 commit a527224
Copy full SHA for a527224

File tree

3 files changed

+5
-4
lines changed
Filter options

3 files changed

+5
-4
lines changed

‎.github/workflows/pythonpackage.yml

Copy file name to clipboardExpand all lines: .github/workflows/pythonpackage.yml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
16+
os: ["ubuntu-22.04", "macos-latest", "windows-latest"]
1717
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
1818
exclude:
1919
- os: "macos-latest"

‎git/cmd.py

Copy file name to clipboardExpand all lines: git/cmd.py
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,6 +1269,7 @@ def execute(
12691269
stdout=stdout_sink,
12701270
shell=shell,
12711271
universal_newlines=universal_newlines,
1272+
encoding=defenc if universal_newlines else None,
12721273
**subprocess_kwargs,
12731274
)
12741275
except cmd_not_found_exception as err:

‎git/remote.py

Copy file name to clipboardExpand all lines: git/remote.py
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ def _get_fetch_info_from_stderr(
894894
None,
895895
progress_handler,
896896
finalizer=None,
897-
decode_streams=True,
897+
decode_streams=False,
898898
kill_after_timeout=kill_after_timeout,
899899
)
900900

@@ -1071,7 +1071,7 @@ def fetch(
10711071
Git.check_unsafe_options(options=list(kwargs.keys()), unsafe_options=self.unsafe_git_fetch_options)
10721072

10731073
proc = self.repo.git.fetch(
1074-
"--", self, *args, as_process=True, with_stdout=False, universal_newlines=False, v=verbose, **kwargs
1074+
"--", self, *args, as_process=True, with_stdout=False, universal_newlines=True, v=verbose, **kwargs
10751075
)
10761076
res = self._get_fetch_info_from_stderr(proc, progress, kill_after_timeout=kill_after_timeout)
10771077
if hasattr(self.repo.odb, "update_cache"):
@@ -1125,7 +1125,7 @@ def pull(
11251125
Git.check_unsafe_options(options=list(kwargs.keys()), unsafe_options=self.unsafe_git_pull_options)
11261126

11271127
proc = self.repo.git.pull(
1128-
"--", self, refspec, with_stdout=False, as_process=True, universal_newlines=False, v=True, **kwargs
1128+
"--", self, refspec, with_stdout=False, as_process=True, universal_newlines=True, v=True, **kwargs
11291129
)
11301130
res = self._get_fetch_info_from_stderr(proc, progress, kill_after_timeout=kill_after_timeout)
11311131
if hasattr(self.repo.odb, "update_cache"):

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.