Merge branch 'js/mingw-hooks-with-exe-suffix'

Names of the various hook scripts must be spelled exactly, but on
Windows, an .exe binary must be named with .exe suffix; notice
$GIT_DIR/hooks/<hookname>.exe as a valid <hookname> hook.

* js/mingw-hooks-with-exe-suffix:
  mingw: allow hooks to be .exe files
This commit is contained in:
Junio C Hamano 2017-02-02 13:36:57 -08:00
Родитель 140d41ae87 235be51fbe
Коммит cddbda4bc8
1 изменённых файлов: 7 добавлений и 1 удалений

Просмотреть файл

@ -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;
}