◐ Shell
reader mode source ↗
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
File filter
Conversations
Jump to
Diff view
Apply and reload
Show whitespace
Diff view
Apply and reload
3 changes: 1 addition & 2 deletions README.md
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`
script in the repository root. Otherwise you will encounter test failures.

On _Windows_, make sure you have `git-daemon` in your PATH. For MINGW-git, the `git-daemon.exe`
exists in `Git\mingw64\libexec\git-core\`; CYGWIN has no daemon, but should get along fine
with MINGW's.

#### Install test dependencies

Expand Down
17 changes: 7 additions & 10 deletions test/lib/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,10 @@ def git_daemon_launched(base_path, ip, port):
gd = None
try:
if is_win:
## On MINGW-git, daemon exists in .\Git\mingw64\libexec\git-core\,
# but if invoked as 'git daemon', it detaches from parent `git` cmd,
# and then CANNOT DIE!
# So, invoke it as a single command.
## Cygwin-git has no daemon. But it can use MINGW's.
#
daemon_cmd = [
"git-daemon",
"--enable=receive-pack",
Expand Down Expand Up @@ -217,12 +215,11 @@ def git_daemon_launched(base_path, ip, port):
)
if is_win:
msg += textwrap.dedent(
r"""

On Windows,
the `git-daemon.exe` must be in PATH.
For MINGW, look into .\Git\mingw64\libexec\git-core\), but problems with paths might appear.
CYGWIN has no daemon, but if one exists, it gets along fine (but has also paths problems)."""
)
log.warning(msg, ex, ip, port, base_path, base_path, exc_info=1)

Expand Down Expand Up @@ -305,7 +302,7 @@ def remote_repo_creator(self):
cw.set("url", remote_repo_url)

with git_daemon_launched(
Git.polish_url(base_daemon_path, is_cygwin=False), # No daemon in Cygwin.
"127.0.0.1",
GIT_DAEMON_PORT,
):
Expand Down
Toggle all file notes Toggle all file annotations