Skip to content

Commit e07d91a

Browse files
committed
Drop claim about Cygwin not having git-daemon
On a current Cygwin system with git 2.39.0 (the latest version offered by the Cygwin package manager), git-daemon is present, with the Cygwin path /usr/libexec/git-core/git-daemon.exe. In addition, the cygwin-test.yml workflow does not take any special steps to allow git-daemon to work, but all tests pass in it even without skipping or xfailing tests that seem related to git-daemon. The git_daemon_launched function in test/lib/helper.py only invokes git-daemon directly (rather than through "git daemon") when is_win evaluates true, which only happens on native Windows systems, not Cygwin, which is treated the same as (other) Unix-like systems and still works. So maybe Cygwin git-daemon was never a special case. Whether or not it was, the message about git-daemon needing to be findable in a PATH search is also under an is_win check, and thus is never shown on Cygwin. So I've removed the Cygwin part of that message. (Because the path shown is a MinGW-style path, I have kept the wording about that being for MinGW-git, even though it is no longer needed to disambiguate the Cygwin case.)
1 parent 7d4f6c6 commit e07d91a

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

Diff for: README.md

+1-2
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

Diff for: test/lib/helper.py

+6-9
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
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.
186184
daemon_cmd = [
187185
"git-daemon",
188186
"--enable=receive-pack",
@@ -217,12 +215,11 @@ def git_daemon_launched(base_path, ip, port):
217215
)
218216
if is_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

0 commit comments

Comments
 (0)