Commit 04f3200
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
2 files changed
Lines changed: 1 addition & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -121,9 +121,6 @@ _Important_: Right after cloning this repository, please be sure to have execute | |||
| 121 | 121 | the `./init-tests-after-clone.sh` script in the repository root. Otherwise | |
| 122 | 122 | you will encounter test failures. | |
| 123 | 123 | ||
| 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 | - | ||
| 127 | 124 | #### Install test dependencies | |
| 128 | 125 | ||
| 129 | 126 | Ensure testing libraries are installed. This is taken care of already if you installed with: | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -182,7 +182,7 @@ def git_daemon_launched(base_path, ip, port): | |||
| 182 | 182 | # and then CANNOT DIE! | |
| 183 | 183 | # So, invoke it as a single command. | |
| 184 | 184 | daemon_cmd = [ | |
| 185 | - "git-daemon", | ||
| 185 | + osp.join(Git()._call_process("--exec-path"), "git-daemon"), | ||
| 186 | 186 | "--enable=receive-pack", | |
| 187 | 187 | "--listen=%s" % ip, | |
| 188 | 188 | "--port=%s" % port, | |
0 commit comments