diff-lib.c: adjust position of i-t-a entries in diff

diff --git a/run-command.c b/run-command.c
index 79a0a763ec61c0195711606b771f717dbbaab7c4..3afb124c79dcb234344e17795205153d4a2e0643 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -4,10 +4,6 @@
 #include "sigchain.h"
 #include "argv-array.h"
 
-#ifndef SHELL_PATH
-# define SHELL_PATH "/bin/sh"
-#endif
-
 void child_process_init(struct child_process *child)
 {
        memset(child, 0, sizeof(*child));
@@ -636,7 +632,7 @@ static struct {
 
 static int git_atexit_installed;
 
-static void git_atexit_dispatch()
+static void git_atexit_dispatch(void)
 {
        size_t i;
 
@@ -644,7 +640,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 +829,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;
-}