Flush fixes up to the third batch post 2.22.0

diff --git a/config.h b/config.h
index f9d5593c8b24dae70483a535efe102a43ae304ee..f0ed464004da601a26d574b1cdc158abb50ae2bc 100644 (file)
--- a/config.h
+++ b/config.h
@@ -55,6 +55,10 @@ typedef int (*config_parser_event_fn_t)(enum config_event_t type,
 
 struct config_options {
        unsigned int respect_includes : 1;
+       unsigned int ignore_repo : 1;
+       unsigned int ignore_worktree : 1;
+       unsigned int ignore_cmdline : 1;
+       unsigned int system_gently : 1;
        const char *commondir;
        const char *git_dir;
        config_parser_event_fn_t event_fn;
@@ -71,22 +75,23 @@ typedef int (*config_fn_t)(const char *, const char *, void *);
 int git_default_config(const char *, const char *, void *);
 int git_config_from_file(config_fn_t fn, const char *, void *);
 int git_config_from_file_with_options(config_fn_t fn, const char *,
-                                            void *,
-                                            const struct config_options *);
+                                     void *,
+                                     const struct config_options *);
 int git_config_from_mem(config_fn_t fn,
-                              const enum config_origin_type,
-                              const char *name,
-                              const char *buf, size_t len,
-                              void *data, const struct config_options *opts);
+                       const enum config_origin_type,
+                       const char *name,
+                       const char *buf, size_t len,
+                       void *data, const struct config_options *opts);
 int git_config_from_blob_oid(config_fn_t fn, const char *name,
-                                   const struct object_id *oid, void *data);
+                            const struct object_id *oid, void *data);
 void git_config_push_parameter(const char *text);
 int git_config_from_parameters(config_fn_t fn, void *data);
 void read_early_config(config_fn_t cb, void *data);
+void read_very_early_config(config_fn_t cb, void *data);
 void git_config(config_fn_t fn, void *);
 int config_with_options(config_fn_t fn, void *,
-                              struct git_config_source *config_source,
-                              const struct config_options *opts);
+                       struct git_config_source *config_source,
+                       const struct config_options *opts);
 int git_parse_ssize_t(const char *, ssize_t *);
 int git_parse_ulong(const char *, unsigned long *);
 int git_parse_maybe_bool(const char *);
@@ -160,9 +165,9 @@ int git_config_include(const char *name, const char *value, void *data);
  * there is no subsection at all.
  */
 int parse_config_key(const char *var,
-                           const char *section,
-                           const char **subsection, int *subsection_len,
-                           const char **key);
+                    const char *section,
+                    const char **subsection, int *subsection_len,
+                    const char **key);
 
 struct config_set_element {
        struct hashmap_entry ent;
@@ -215,25 +220,25 @@ int git_configset_get_pathname(struct config_set *cs, const char *key, const cha
 struct repository;
 void repo_config(struct repository *repo, config_fn_t fn, void *data);
 int repo_config_get_value(struct repository *repo,
-                                const char *key, const char **value);
+                         const char *key, const char **value);
 const struct string_list *repo_config_get_value_multi(struct repository *repo,
-                                                            const char *key);
+                                                     const char *key);
 int repo_config_get_string_const(struct repository *repo,
-                                       const char *key, const char **dest);
+                                const char *key, const char **dest);
 int repo_config_get_string(struct repository *repo,
-                                 const char *key, char **dest);
+                          const char *key, char **dest);
 int repo_config_get_int(struct repository *repo,
-                              const char *key, int *dest);
+                       const char *key, int *dest);
 int repo_config_get_ulong(struct repository *repo,
-                                const char *key, unsigned long *dest);
+                         const char *key, unsigned long *dest);
 int repo_config_get_bool(struct repository *repo,
-                               const char *key, int *dest);
+                        const char *key, int *dest);
 int repo_config_get_bool_or_int(struct repository *repo,
-                                      const char *key, int *is_bool, int *dest);
+                               const char *key, int *is_bool, int *dest);
 int repo_config_get_maybe_bool(struct repository *repo,
-                                     const char *key, int *dest);
+                              const char *key, int *dest);
 int repo_config_get_pathname(struct repository *repo,
-                                   const char *key, const char **dest);
+                            const char *key, const char **dest);
 
 int git_config_get_value(const char *key, const char **value);
 const struct string_list *git_config_get_value_multi(const char *key);
@@ -265,7 +270,7 @@ struct key_value_info {
        enum config_scope scope;
 };
 
-extern NORETURN void git_die_config(const char *key, const char *err, ...) __attribute__((format(printf, 2, 3)));
+NORETURN void git_die_config(const char *key, const char *err, ...) __attribute__((format(printf, 2, 3)));
 NORETURN void git_die_config_linenr(const char *key, const char *filename, int linenr);
 
 #define LOOKUP_CONFIG(mapping, var) \