diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-08-10 02:18:15 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-08-10 02:18:16 +0300 |
| commit | 8cdd5e713d7ba54b9d26ac997408bb745ab55088 (patch) | |
| tree | 89df70d128a7f41f454a9eb29cdac0dfe86b994d /run-command.c | |
| parent | b6e2a0c0b30dccd050706354eaa64a9e8ed900e5 (diff) | |
| parent | fff1594fa77372ea7a51f6b445267f23fdbf3089 (diff) | |
Merge branch 'ma/locate-in-path-for-windows'
"git bisect visualize" stopped running "gitk" on Git for Windows
when the command was reimplemented in C around Git 2.34 timeframe.
This has been corrected.
* ma/locate-in-path-for-windows:
docs: update when `git bisect visualize` uses `gitk`
compat/mingw: implement a native locate_in_PATH()
run-command: conditionally define locate_in_PATH()
Diffstat (limited to 'run-command.c')
| -rw-r--r-- | run-command.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/run-command.c b/run-command.c index b22ee36073..a558042c87 100644 --- a/run-command.c +++ b/run-command.c @@ -170,6 +170,7 @@ int is_executable(const char *name) return st.st_mode & S_IXUSR; } +#ifndef locate_in_PATH /* * Search $PATH for a command. This emulates the path search that * execvp would perform, without actually executing the command so it @@ -218,6 +219,7 @@ static char *locate_in_PATH(const char *file) strbuf_release(&buf); return NULL; } +#endif int exists_in_PATH(const char *command) { |