Merge branch 'ma/mailing-list-address-in-git-help' into maint

diff --git a/apply.h b/apply.h
index 01963b5ec4eec9352de36c41cae0138d8eb1d049..59483481330c61033d56e363f70dff08f4d689af 100644 (file)
--- a/apply.h
+++ b/apply.h
@@ -1,6 +1,11 @@
 #ifndef APPLY_H
 #define APPLY_H
 
+#include "lockfile.h"
+#include "string-list.h"
+
+struct repository;
+
 enum apply_ws_error_action {
        nowarn_ws_error,
        warn_on_ws_error,
@@ -62,6 +67,7 @@ struct apply_state {
        int unsafe_paths;
 
        /* Other non boolean parameters */
+       struct repository *repo;
        const char *index_file;
        enum apply_verbosity apply_verbosity;
        const char *fake_ancestor;
@@ -116,6 +122,7 @@ int apply_parse_options(int argc, const char **argv,
                        int *force_apply, int *options,
                        const char * const *apply_usage);
 int init_apply_state(struct apply_state *state,
+                    struct repository *repo,
                     const char *prefix);
 void clear_apply_state(struct apply_state *state);
 int check_apply_state(struct apply_state *state, int force_apply);