Re: [PATCH v3] mingw: allow hooks to be .exe files

2017-01-30 Thread Junio C Hamano
Johannes Schindelin  writes:

> Executable files in Windows need to have the extension '.exe', otherwise
> they do not work. Extend the hooks to not just look at the hard coded
> names, but also at the names extended by the custom STRIP_EXTENSION,
> which is defined as '.exe' in Windows.

Will replace, and looks good enough for 'next'.  Let's stop
iterating and go incremental if/as needed.

Thanks.


[PATCH v3] mingw: allow hooks to be .exe files

2017-01-30 Thread Johannes Schindelin
Executable files in Windows need to have the extension '.exe', otherwise
they do not work. Extend the hooks to not just look at the hard coded
names, but also at the names extended by the custom STRIP_EXTENSION,
which is defined as '.exe' in Windows.

Signed-off-by: Johannes Schindelin 
---
Published-As: https://github.com/dscho/git/releases/tag/exe-as-hook-v3
Fetch-It-Via: git fetch https://github.com/dscho/git exe-as-hook-v3

 run-command.c | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/run-command.c b/run-command.c
index 73bfba7ef9..5227f78aea 100644
--- a/run-command.c
+++ b/run-command.c
@@ -871,8 +871,14 @@ const char *find_hook(const char *name)
 
strbuf_reset(&path);
strbuf_git_path(&path, "hooks/%s", name);
-   if (access(path.buf, X_OK) < 0)
+   if (access(path.buf, X_OK) < 0) {
+#ifdef STRIP_EXTENSION
+   strbuf_addstr(&path, STRIP_EXTENSION);
+   if (access(path.buf, X_OK) >= 0)
+   return path.buf;
+#endif
return NULL;
+   }
return path.buf;
 }
 

base-commit: 4e59582ff70d299f5a88449891e78d15b4b3fabe
-- 
2.11.1.windows.prerelease.2.9.g3014b57