Skip to content

Commit 04f3200

Browse files
committed
Ask git where its daemon is and use that
This changes the test helpers on Windows to use "git --exec-path" (with whatever "git" GitPython is using) to find the directory that contains "git-daemon.exe", instead of finding it in a PATH search.
1 parent 4345faa commit 04f3200

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

README.md

-3
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,6 @@ _Important_: Right after cloning this repository, please be sure to have execute
121121
the `./init-tests-after-clone.sh` script in the repository root. Otherwise
122122
you will encounter test failures.
123123

124-
On _Windows_, make sure you have `git-daemon` in your PATH. For MINGW-git, the `git-daemon.exe`
125-
exists in `Git\mingw64\libexec\git-core\`.
126-
127124
#### Install test dependencies
128125

129126
Ensure testing libraries are installed. This is taken care of already if you installed with:

test/lib/helper.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ def git_daemon_launched(base_path, ip, port):
182182
# and then CANNOT DIE!
183183
# So, invoke it as a single command.
184184
daemon_cmd = [
185-
"git-daemon",
185+
osp.join(Git()._call_process("--exec-path"), "git-daemon"),
186186
"--enable=receive-pack",
187187
"--listen=%s" % ip,
188188
"--port=%s" % port,

0 commit comments

Comments
 (0)