Merge branch 'ps/submodule-sanitize-path-upon-add' into maint

diff --git a/run-command.c b/run-command.c
index 79a0a763ec61c0195711606b771f717dbbaab7c4..0b432cc9713251b4d116bedf52ae1f51bd9d80cf 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -636,7 +636,7 @@ static struct {
 
 static int git_atexit_installed;
 
-static void git_atexit_dispatch()
+static void git_atexit_dispatch(void)
 {
        size_t i;
 
@@ -644,7 +644,7 @@ static void git_atexit_dispatch()
                git_atexit_hdlrs.handlers[i-1]();
 }
 
-static void git_atexit_clear()
+static void git_atexit_clear(void)
 {
        free(git_atexit_hdlrs.handlers);
        memset(&git_atexit_hdlrs, 0, sizeof(git_atexit_hdlrs));
@@ -833,20 +833,3 @@ int run_hook_le(const char *const *env, const char *name, ...)
 
        return ret;
 }
-
-int run_hook_with_custom_index(const char *index_file, const char *name, ...)
-{
-       const char *hook_env[3] =  { NULL };
-       char index[PATH_MAX];
-       va_list args;
-       int ret;
-
-       snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
-       hook_env[0] = index;
-
-       va_start(args, name);
-       ret = run_hook_ve(hook_env, name, args);
-       va_end(args);
-
-       return ret;
-}