Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commitf9a3b83

Browse files
authored
Merge pull request#1684 from EliahKagan/daemon
Update instructions and test helpers for git-daemon
2 parents7d4f6c6 +35e3875 commitf9a3b83

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

‎README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@ executed `git fetch --tags` followed by the `./init-tests-after-clone.sh`
119119
script in the repository root. Otherwise you will encounter test failures.
120120

121121
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\`.
124123

125124
####Install test dependencies
126125

‎test/lib/helper.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,10 @@ def git_daemon_launched(base_path, ip, port):
177177
gd=None
178178
try:
179179
ifis_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.
186184
daemon_cmd= [
187185
"git-daemon",
188186
"--enable=receive-pack",
@@ -217,12 +215,11 @@ def git_daemon_launched(base_path, ip, port):
217215
)
218216
ifis_win:
219217
msg+=textwrap.dedent(
220-
r"""
218+
R"""
221219
222220
On Windows,
223221
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."""
226223
)
227224
log.warning(msg,ex,ip,port,base_path,base_path,exc_info=1)
228225

@@ -305,7 +302,7 @@ def remote_repo_creator(self):
305302
cw.set("url",remote_repo_url)
306303

307304
withgit_daemon_launched(
308-
Git.polish_url(base_daemon_path,is_cygwin=False),# No daemon in Cygwin.
305+
Git.polish_url(base_daemon_path),
309306
"127.0.0.1",
310307
GIT_DAEMON_PORT,
311308
):

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp