git manpage: note git-security@googlegroups.com

diff --git a/apply.h b/apply.h
index 902346b2f1c90a01129cd8f32470c01639a5fb5f..dc4a0190570d060d23e8464f465232eddcf76deb 100644 (file)
--- a/apply.h
+++ b/apply.h
@@ -35,11 +35,9 @@ enum apply_verbosity {
 
 struct apply_state {
        const char *prefix;
-       int prefix_length;
 
-       /* These are lock_file related */
-       struct lock_file *lock_file;
-       int newfd;
+       /* Lock file */
+       struct lock_file lock_file;
 
        /* These control what gets looked at and modified */
        int apply; /* this is not a dry-run */
@@ -63,6 +61,7 @@ struct apply_state {
        int unsafe_paths;
 
        /* Other non boolean parameters */
+       const char *index_file;
        enum apply_verbosity apply_verbosity;
        const char *fake_ancestor;
        const char *patch_input_file;
@@ -111,23 +110,12 @@ struct apply_state {
        int applied_after_fixing_ws;
 };
 
-extern int apply_option_parse_exclude(const struct option *opt,
-                                     const char *arg, int unset);
-extern int apply_option_parse_include(const struct option *opt,
-                                     const char *arg, int unset);
-extern int apply_option_parse_p(const struct option *opt,
-                               const char *arg,
-                               int unset);
-extern int apply_option_parse_whitespace(const struct option *opt,
-                                        const char *arg, int unset);
-extern int apply_option_parse_directory(const struct option *opt,
-                                       const char *arg, int unset);
-extern int apply_option_parse_space_change(const struct option *opt,
-                                          const char *arg, int unset);
-
+extern int apply_parse_options(int argc, const char **argv,
+                              struct apply_state *state,
+                              int *force_apply, int *options,
+                              const char * const *apply_usage);
 extern int init_apply_state(struct apply_state *state,
-                           const char *prefix,
-                           struct lock_file *lock_file);
+                           const char *prefix);
 extern void clear_apply_state(struct apply_state *state);
 extern int check_apply_state(struct apply_state *state, int force_apply);