git,remote: use universal new lines for fetch/pull stderr capture · gitpython-developers/GitPython@1bb4651 · GitHub

1. gitpython-developers
2. GitPython

Repository navigation

• Code
• Issues6 (6)
• Pull requests7 (7)
• Discussions
• Actions
• Security and quality42 (42)
• Insights

Commit 1bb4651

Browse filesBrowse the repository at this point in the historyBrowse files

fvalette-ledger

committed

git,remote: use universal new lines for fetch/pull stderr capture

See #1969 stderr parser call RemoteProgress update on each line received. With universal_newlines set to False, there is a mixup between line feed and carriage return. In the `handle_process_output` thread, this is thus seen as a single line for the whole output on each steps.

1 parent 49ca909 commit 1bb4651
Copy full SHA for 1bb4651

1 file changed

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

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• git
  • remote.py

Expand file treeCollapse file tree

Open diff view settings

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)