diff options
| -rw-r--r-- | builtin/ls-remote.c | 1 | ||||
| -rw-r--r-- | builtin/pack-objects.c | 1 | ||||
| -rw-r--r-- | builtin/receive-pack.c | 1 | ||||
| -rw-r--r-- | builtin/reflog.c | 1 | ||||
| -rw-r--r-- | builtin/send-pack.c | 1 | ||||
| -rw-r--r-- | diagnose.c | 1 | ||||
| -rw-r--r-- | diagnose.h | 3 | ||||
| -rw-r--r-- | list-objects-filter-options.c | 1 | ||||
| -rw-r--r-- | list-objects-filter-options.h | 3 | ||||
| -rw-r--r-- | ref-filter.h | 2 | ||||
| -rw-r--r-- | remote.c | 1 | ||||
| -rw-r--r-- | remote.h | 2 | ||||
| -rw-r--r-- | revision.c | 1 | ||||
| -rw-r--r-- | revision.h | 3 | ||||
| -rw-r--r-- | send-pack.c | 1 |
15 files changed, 18 insertions, 5 deletions
diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c index 2dfbd8ed9b..a9de0575ce 100644 --- a/builtin/ls-remote.c +++ b/builtin/ls-remote.c @@ -5,6 +5,7 @@ #include "ref-filter.h" #include "remote.h" #include "refs.h" +#include "parse-options.h" static const char * const ls_remote_usage[] = { N_("git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 545b8bddc8..7e9e20172a 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -39,6 +39,7 @@ #include "shallow.h" #include "promisor-remote.h" #include "pack-mtimes.h" +#include "parse-options.h" /* * Objects we are going to pack are collected in the `to_pack` structure. diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index cccdb73807..554cda269d 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -31,6 +31,7 @@ #include "commit-reach.h" #include "worktree.h" #include "shallow.h" +#include "parse-options.h" static const char * const receive_pack_usage[] = { N_("git receive-pack <git-dir>"), diff --git a/builtin/reflog.c b/builtin/reflog.c index 270681dcdf..9b000bb6bc 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -4,6 +4,7 @@ #include "reachable.h" #include "worktree.h" #include "reflog.h" +#include "parse-options.h" #define BUILTIN_REFLOG_SHOW_USAGE \ N_("git reflog [show] [<log-options>] [<ref>]") diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 91c03df3f3..640125fe95 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -16,6 +16,7 @@ #include "gpg-interface.h" #include "gettext.h" #include "protocol.h" +#include "parse-options.h" static const char * const send_pack_usage[] = { N_("git send-pack [--mirror] [--dry-run] [--force]\n" diff --git a/diagnose.c b/diagnose.c index 5b398f0cff..998f517c48 100644 --- a/diagnose.c +++ b/diagnose.c @@ -8,6 +8,7 @@ #include "strvec.h" #include "object-store.h" #include "packfile.h" +#include "parse-options.h" struct archive_dir { const char *path; diff --git a/diagnose.h b/diagnose.h index 7a4951a786..f525219ab0 100644 --- a/diagnose.h +++ b/diagnose.h @@ -2,7 +2,8 @@ #define DIAGNOSE_H #include "strbuf.h" -#include "parse-options.h" + +struct option; enum diagnose_mode { DIAGNOSE_NONE, diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c index 1d25a5737d..72aeb089cc 100644 --- a/list-objects-filter-options.c +++ b/list-objects-filter-options.c @@ -11,6 +11,7 @@ #include "promisor-remote.h" #include "trace.h" #include "url.h" +#include "parse-options.h" static int parse_combine_filter( struct list_objects_filter_options *filter_options, diff --git a/list-objects-filter-options.h b/list-objects-filter-options.h index ef03b45132..727c986122 100644 --- a/list-objects-filter-options.h +++ b/list-objects-filter-options.h @@ -2,10 +2,11 @@ #define LIST_OBJECTS_FILTER_OPTIONS_H #include "object.h" -#include "parse-options.h" #include "string-list.h" #include "strbuf.h" +struct option; + /* * The list of defined filters for list-objects. */ diff --git a/ref-filter.h b/ref-filter.h index aa0eea4ecf..daa6d02017 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -4,7 +4,6 @@ #include "oid-array.h" #include "refs.h" #include "commit.h" -#include "parse-options.h" /* Quoting styles */ #define QUOTE_NONE 0 @@ -24,6 +23,7 @@ struct atom_value; struct ref_sorting; +struct option; enum ref_sorting_order { REF_SORTING_REVERSE = 1<<0, @@ -17,6 +17,7 @@ #include "commit-reach.h" #include "advice.h" #include "connect.h" +#include "parse-options.h" enum map_direction { FROM_SRC, FROM_DST }; @@ -1,10 +1,10 @@ #ifndef REMOTE_H #define REMOTE_H -#include "parse-options.h" #include "hashmap.h" #include "refspec.h" +struct option; struct transport_ls_refs_options; /** diff --git a/revision.c b/revision.c index e4c066e90b..8b1ecf07fc 100644 --- a/revision.c +++ b/revision.c @@ -37,6 +37,7 @@ #include "json-writer.h" #include "list-objects-filter-options.h" #include "resolve-undo.h" +#include "parse-options.h" volatile show_early_output_fn_t show_early_output; diff --git a/revision.h b/revision.h index ab71443696..649f817f39 100644 --- a/revision.h +++ b/revision.h @@ -2,7 +2,6 @@ #define REVISION_H #include "commit.h" -#include "parse-options.h" #include "grep.h" #include "notes.h" #include "pretty.h" @@ -62,6 +61,8 @@ struct string_list; struct saved_parents; struct bloom_key; struct bloom_filter_settings; +struct option; +struct parse_opt_ctx_t; define_shared_commit_slab(revision_sources, char *); struct rev_cmdline_info { diff --git a/send-pack.c b/send-pack.c index 423a5cfe22..0d05191162 100644 --- a/send-pack.c +++ b/send-pack.c @@ -17,6 +17,7 @@ #include "gpg-interface.h" #include "cache.h" #include "shallow.h" +#include "parse-options.h" int option_parse_push_signed(const struct option *opt, const char *arg, int unset) |