pull --rebase: exit early when the working directory is dirty

diff --git a/exec_cmd.h b/exec_cmd.h
index 849a8395a0c03ba2976fe4802eee8150fdec5816..a892355c8212298130fb3925c6cba352ed6999b6 100644 (file)
--- a/exec_cmd.h
+++ b/exec_cmd.h
@@ -1,8 +1,9 @@
 #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 const char* git_exec_path(void);
+extern void setup_path(const char *);
 extern int execv_git_cmd(const char **argv); /* NULL terminated */
 extern int execl_git_cmd(const char *cmd, ...);