hook.[ch]: move find_hook() from run-command.c to hook.c
Move the find_hook() function from run-command.c to a new hook.c library. This change establishes a stub library that's pretty pointless right now, but will see much wider use with Emily Shaffer's upcoming "configuration-based hooks" series. Eventually all the hook related code will live in hook.[ch]. Let's start that process by moving the simple find_hook() function over as-is. Signed-off-by: Emily Shaffer <emilyshaffer@google.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
f53df0bdf6
commit
5e3aba33da
1
Makefile
1
Makefile
@ -904,6 +904,7 @@ LIB_OBJS += hash-lookup.o
|
||||
LIB_OBJS += hashmap.o
|
||||
LIB_OBJS += help.o
|
||||
LIB_OBJS += hex.o
|
||||
LIB_OBJS += hook.o
|
||||
LIB_OBJS += ident.o
|
||||
LIB_OBJS += json-writer.o
|
||||
LIB_OBJS += kwset.o
|
||||
|
@ -11,6 +11,7 @@
|
||||
#include "parse-options.h"
|
||||
#include "dir.h"
|
||||
#include "run-command.h"
|
||||
#include "hook.h"
|
||||
#include "quote.h"
|
||||
#include "tempfile.h"
|
||||
#include "lockfile.h"
|
||||
|
@ -3,7 +3,7 @@
|
||||
#include "strbuf.h"
|
||||
#include "help.h"
|
||||
#include "compat/compiler.h"
|
||||
#include "run-command.h"
|
||||
#include "hook.h"
|
||||
|
||||
|
||||
static void get_system_info(struct strbuf *sys_info)
|
||||
|
@ -19,6 +19,7 @@
|
||||
#include "revision.h"
|
||||
#include "wt-status.h"
|
||||
#include "run-command.h"
|
||||
#include "hook.h"
|
||||
#include "refs.h"
|
||||
#include "log-tree.h"
|
||||
#include "strbuf.h"
|
||||
|
@ -13,6 +13,7 @@
|
||||
#include "builtin.h"
|
||||
#include "lockfile.h"
|
||||
#include "run-command.h"
|
||||
#include "hook.h"
|
||||
#include "diff.h"
|
||||
#include "diff-merges.h"
|
||||
#include "refs.h"
|
||||
|
@ -7,6 +7,7 @@
|
||||
#include "pkt-line.h"
|
||||
#include "sideband.h"
|
||||
#include "run-command.h"
|
||||
#include "hook.h"
|
||||
#include "exec-cmd.h"
|
||||
#include "commit.h"
|
||||
#include "object.h"
|
||||
|
@ -8,6 +8,7 @@
|
||||
#include "branch.h"
|
||||
#include "refs.h"
|
||||
#include "run-command.h"
|
||||
#include "hook.h"
|
||||
#include "sigchain.h"
|
||||
#include "submodule.h"
|
||||
#include "utf8.h"
|
||||
|
37
hook.c
Normal file
37
hook.c
Normal file
@ -0,0 +1,37 @@
|
||||
#include "cache.h"
|
||||
#include "hook.h"
|
||||
#include "run-command.h"
|
||||
|
||||
const char *find_hook(const char *name)
|
||||
{
|
||||
static struct strbuf path = STRBUF_INIT;
|
||||
|
||||
strbuf_reset(&path);
|
||||
strbuf_git_path(&path, "hooks/%s", name);
|
||||
if (access(path.buf, X_OK) < 0) {
|
||||
int err = errno;
|
||||
|
||||
#ifdef STRIP_EXTENSION
|
||||
strbuf_addstr(&path, STRIP_EXTENSION);
|
||||
if (access(path.buf, X_OK) >= 0)
|
||||
return path.buf;
|
||||
if (errno == EACCES)
|
||||
err = errno;
|
||||
#endif
|
||||
|
||||
if (err == EACCES && advice_enabled(ADVICE_IGNORED_HOOK)) {
|
||||
static struct string_list advise_given = STRING_LIST_INIT_DUP;
|
||||
|
||||
if (!string_list_lookup(&advise_given, name)) {
|
||||
string_list_insert(&advise_given, name);
|
||||
advise(_("The '%s' hook was ignored because "
|
||||
"it's not set as executable.\n"
|
||||
"You can disable this warning with "
|
||||
"`git config advice.ignoredHook false`."),
|
||||
path.buf);
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
return path.buf;
|
||||
}
|
11
hook.h
Normal file
11
hook.h
Normal file
@ -0,0 +1,11 @@
|
||||
#ifndef HOOK_H
|
||||
#define HOOK_H
|
||||
|
||||
/*
|
||||
* Returns the path to the hook file, or NULL if the hook is missing
|
||||
* or disabled. Note that this points to static storage that will be
|
||||
* overwritten by further calls to find_hook and run_hook_*.
|
||||
*/
|
||||
const char *find_hook(const char *name);
|
||||
|
||||
#endif
|
1
refs.c
1
refs.c
@ -10,6 +10,7 @@
|
||||
#include "refs.h"
|
||||
#include "refs/refs-internal.h"
|
||||
#include "run-command.h"
|
||||
#include "hook.h"
|
||||
#include "object-store.h"
|
||||
#include "object.h"
|
||||
#include "tag.h"
|
||||
|
@ -9,6 +9,7 @@
|
||||
#include "quote.h"
|
||||
#include "config.h"
|
||||
#include "packfile.h"
|
||||
#include "hook.h"
|
||||
|
||||
void child_process_init(struct child_process *child)
|
||||
{
|
||||
@ -1322,40 +1323,6 @@ int async_with_fork(void)
|
||||
#endif
|
||||
}
|
||||
|
||||
const char *find_hook(const char *name)
|
||||
{
|
||||
static struct strbuf path = STRBUF_INIT;
|
||||
|
||||
strbuf_reset(&path);
|
||||
strbuf_git_path(&path, "hooks/%s", name);
|
||||
if (access(path.buf, X_OK) < 0) {
|
||||
int err = errno;
|
||||
|
||||
#ifdef STRIP_EXTENSION
|
||||
strbuf_addstr(&path, STRIP_EXTENSION);
|
||||
if (access(path.buf, X_OK) >= 0)
|
||||
return path.buf;
|
||||
if (errno == EACCES)
|
||||
err = errno;
|
||||
#endif
|
||||
|
||||
if (err == EACCES && advice_enabled(ADVICE_IGNORED_HOOK)) {
|
||||
static struct string_list advise_given = STRING_LIST_INIT_DUP;
|
||||
|
||||
if (!string_list_lookup(&advise_given, name)) {
|
||||
string_list_insert(&advise_given, name);
|
||||
advise(_("The '%s' hook was ignored because "
|
||||
"it's not set as executable.\n"
|
||||
"You can disable this warning with "
|
||||
"`git config advice.ignoredHook false`."),
|
||||
path.buf);
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
return path.buf;
|
||||
}
|
||||
|
||||
int run_hook_ve(const char *const *env, const char *name, va_list args)
|
||||
{
|
||||
struct child_process hook = CHILD_PROCESS_INIT;
|
||||
|
@ -224,13 +224,6 @@ int finish_command_in_signal(struct child_process *);
|
||||
*/
|
||||
int run_command(struct child_process *);
|
||||
|
||||
/*
|
||||
* Returns the path to the hook file, or NULL if the hook is missing
|
||||
* or disabled. Note that this points to static storage that will be
|
||||
* overwritten by further calls to find_hook and run_hook_*.
|
||||
*/
|
||||
const char *find_hook(const char *name);
|
||||
|
||||
/**
|
||||
* Run a hook.
|
||||
* The first argument is a pathname to an index file, or NULL
|
||||
|
@ -8,6 +8,7 @@
|
||||
#include "sequencer.h"
|
||||
#include "tag.h"
|
||||
#include "run-command.h"
|
||||
#include "hook.h"
|
||||
#include "exec-cmd.h"
|
||||
#include "utf8.h"
|
||||
#include "cache-tree.h"
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include "cache.h"
|
||||
#include "config.h"
|
||||
#include "transport.h"
|
||||
#include "run-command.h"
|
||||
#include "hook.h"
|
||||
#include "pkt-line.h"
|
||||
#include "fetch-pack.h"
|
||||
#include "remote.h"
|
||||
|
Loading…
Reference in New Issue
Block a user