Skip to content

Commit

Permalink
Ask git where its daemon is and use that
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
EliahKagan committed Oct 7, 2023
1 parent 4345faa commit 04f3200
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,6 @@ _Important_: Right after cloning this repository, please be sure to have execute
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\`.

#### Install test dependencies

Ensure testing libraries are installed. This is taken care of already if you installed with:
Expand Down
2 changes: 1 addition & 1 deletion test/lib/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ def git_daemon_launched(base_path, ip, port):
# and then CANNOT DIE!
# So, invoke it as a single command.
daemon_cmd = [
"git-daemon",
osp.join(Git()._call_process("--exec-path"), "git-daemon"),
"--enable=receive-pack",
"--listen=%s" % ip,
"--port=%s" % port,
Expand Down

0 comments on commit 04f3200

Please sign in to comment.