Merge pull request #1971 from fvalette-ledger/fix-fetch-progress-bar · GithubToolNexus/GitPython@a527224 · GitHub

1. GithubToolNexus
2. GitPython

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit a527224

Browse filesBrowse the repository at this point in the historyBrowse files

Byron

authored

Merge pull request gitpython-developers#1971 from fvalette-ledger/fix-fetch-progress-bar

Fix Fetch progress bar

2 parents 49ca909 + d6cdb67 commit a527224
Copy full SHA for a527224

3 files changed

+5-4Lines changed: 5 additions & 4 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .github/workflows
  • pythonpackage.yml
• git
  • cmd.py
  • remote.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.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 number	Diff line number	Diff line change
@@ -13,7 +13,7 @@ jobs:
13	13	strategy:
14	14	fail-fast: false
15	15	matrix:
16		- os: ["ubuntu-latest", "macos-latest", "windows-latest"]
	16	+ os: ["ubuntu-22.04", "macos-latest", "windows-latest"]
17	17	python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
18	18	exclude:
19	19	- os: "macos-latest"

Collapse file

‎git/cmd.py‎

Copy file name to clipboardExpand all lines: git/cmd.py

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -1269,6 +1269,7 @@ def execute(
1269	1269	stdout=stdout_sink,
1270	1270	shell=shell,
1271	1271	universal_newlines=universal_newlines,
	1272	+ encoding=defenc if universal_newlines else None,
1272	1273	**subprocess_kwargs,
1273	1274	)
1274	1275	except cmd_not_found_exception as err:

Collapse file

‎git/remote.py‎

Copy file name to clipboardExpand all lines: git/remote.py

+3-3Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -894,7 +894,7 @@ def _get_fetch_info_from_stderr(
894	894	None,
895	895	progress_handler,
896	896	finalizer=None,
897		- decode_streams=True,
	897	+ decode_streams=False,
898	898	kill_after_timeout=kill_after_timeout,
899	899	)
900	900
@@ -1071,7 +1071,7 @@ def fetch(
1071	1071	Git.check_unsafe_options(options=list(kwargs.keys()), unsafe_options=self.unsafe_git_fetch_options)
1072	1072
1073	1073	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
1075	1075	)
1076	1076	res = self._get_fetch_info_from_stderr(proc, progress, kill_after_timeout=kill_after_timeout)
1077	1077	if hasattr(self.repo.odb, "update_cache"):
@@ -1125,7 +1125,7 @@ def pull(
1125	1125	Git.check_unsafe_options(options=list(kwargs.keys()), unsafe_options=self.unsafe_git_pull_options)
1126	1126
1127	1127	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
1129	1129	)
1130	1130	res = self._get_fetch_info_from_stderr(proc, progress, kill_after_timeout=kill_after_timeout)
1131	1131	if hasattr(self.repo.odb, "update_cache"):

0 commit comments

Comments

0 (0)