Merge pull request #1684 from EliahKagan/daemon · gitpython-developers/GitPython@f9a3b83 · GitHub

gitpython-developers / GitPython Public

• Notifications You must be signed in to change notification settings
• Fork 989
• Star 5.2k

• Code
• Issues 8
• Pull requests 2
• Discussions
• Actions
• Security and quality 34
• Insights

Additional navigation options

Commit f9a3b83

Browse filesBrowse the repository at this point in the historyBrowse files

Byron

authored

Merge pull request #1684 from EliahKagan/daemon

Update instructions and test helpers for git-daemon

2 parents 7d4f6c6 + 35e3875 commit f9a3b83
Copy full SHA for f9a3b83

2 files changed

+8-12Lines changed: 8 additions & 12 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• README.md
• test/lib
  • helper.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎README.md‎

Copy file name to clipboardExpand all lines: README.md

+1-2Lines changed: 1 addition & 2 deletions

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -119,8 +119,7 @@ executed `git fetch --tags` followed by the `./init-tests-after-clone.sh`
119	119	script in the repository root. Otherwise you will encounter test failures.
120	120
121	121	On _Windows_, make sure you have `git-daemon` in your PATH. For MINGW-git, the `git-daemon.exe`
122		- exists in `Git\mingw64\libexec\git-core\`; CYGWIN has no daemon, but should get along fine
123		- with MINGW's.
	122	+ exists in `Git\mingw64\libexec\git-core\`.
124	123
125	124	#### Install test dependencies
126	125

Collapse file

‎test/lib/helper.py‎

Copy file name to clipboardExpand all lines: test/lib/helper.py

+7-10Lines changed: 7 additions & 10 deletions

Original file line number	Diff line number	Diff line change
@@ -177,12 +177,10 @@ def git_daemon_launched(base_path, ip, port):
177	177	gd = None
178	178	try:
179	179	if is_win:
180		- ## On MINGW-git, daemon exists in .\Git\mingw64\libexec\git-core\,
181		- # but if invoked as 'git daemon', it detaches from parent `git` cmd,
182		- # and then CANNOT DIE!
183		- # So, invoke it as a single command.
184		- ## Cygwin-git has no daemon. But it can use MINGW's.
185		- #
	180	+ # On MINGW-git, daemon exists in Git\mingw64\libexec\git-core\,
	181	+ # but if invoked as 'git daemon', it detaches from parent `git` cmd,
	182	+ # and then CANNOT DIE!
	183	+ # So, invoke it as a single command.
186	184	daemon_cmd = [
187	185	"git-daemon",
188	186	"--enable=receive-pack",
@@ -217,12 +215,11 @@ def git_daemon_launched(base_path, ip, port):
217	215	)
218	216	if is_win:
219	217	msg += textwrap.dedent(
220		- r"""
	218	+ R"""
221	219
222	220	On Windows,
223	221	the `git-daemon.exe` must be in PATH.
224		- For MINGW, look into .\Git\mingw64\libexec\git-core\), but problems with paths might appear.
225		- CYGWIN has no daemon, but if one exists, it gets along fine (but has also paths problems)."""
	222	+ For MINGW, look into \Git\mingw64\libexec\git-core\, but problems with paths might appear."""
226	223	)
227	224	log.warning(msg, ex, ip, port, base_path, base_path, exc_info=1)
228	225
@@ -305,7 +302,7 @@ def remote_repo_creator(self):
305	302	cw.set("url", remote_repo_url)
306	303
307	304	with git_daemon_launched(
308		- Git.polish_url(base_daemon_path, is_cygwin=False), # No daemon in Cygwin.
	305	+ Git.polish_url(base_daemon_path),
309	306	"127.0.0.1",
310	307	GIT_DAEMON_PORT,
311	308	):

0 commit comments

Comments

0 (0)