apply: refactor `git apply` option parsing

diff --git a/git-compat-util.h b/git-compat-util.h
index c99cddc54b1ea14955e019dc84088b6c9fd74f88..de04df19a835fa66ada521098db2e9b2d80a904e 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -440,6 +440,9 @@ static inline int const_error(void)
 
 extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params));
 extern void set_error_routine(void (*routine)(const char *err, va_list params));
+extern void (*get_error_routine(void))(const char *err, va_list params);
+extern void set_warn_routine(void (*routine)(const char *warn, va_list params));
+extern void (*get_warn_routine(void))(const char *warn, va_list params);
 extern void set_die_is_recursing_routine(int (*routine)(void));
 extern void set_error_handle(FILE *);
 
@@ -1062,3 +1065,5 @@ struct tm *git_gmtime_r(const time_t *, struct tm *);
 #endif
 
 #endif
+
+extern int cmd_main(int, const char **);