Merge branch 'maint'

diff --git a/exec_cmd.h b/exec_cmd.h
index 989621ff4ecea463c340cb05eb035be0f7cb94a5..594f961387240c221020c9ea0bccd8a39ff69595 100644 (file)
--- a/exec_cmd.h
+++ b/exec_cmd.h
@@ -1,10 +1,13 @@
-#ifndef __GIT_EXEC_CMD_H_
-#define __GIT_EXEC_CMD_H_
+#ifndef GIT_EXEC_CMD_H
+#define GIT_EXEC_CMD_H
 
-extern void git_set_exec_path(const char *exec_path);
+extern void git_set_argv_exec_path(const char *exec_path);
+extern void git_set_argv0_path(const char *path);
 extern const char* git_exec_path(void);
+extern void setup_path(void);
+extern const char **prepare_git_cmd(const char **argv);
 extern int execv_git_cmd(const char **argv); /* NULL terminated */
 extern int execl_git_cmd(const char *cmd, ...);
+extern const char *system_path(const char *path);
 
-
-#endif /* __GIT_EXEC_CMD_H_ */
+#endif /* GIT_EXEC_CMD_H */