Merge branch 'jk/run-command-eacces' into maint

diff --git a/cache.h b/cache.h
index 806bf2b76fbbf7b30b70bad65220d5255a67c69e..5e6eef9b4d0fca96fb0f90265f5f68d640f1583a 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1305,4 +1305,6 @@ extern struct startup_info *startup_info;
 /* builtin/merge.c */
 int checkout_fast_forward(const unsigned char *from, const unsigned char *to);
 
+int sane_execvp(const char *file, char *const argv[]);
+
 #endif /* CACHE_H */