treewide: remove unnecessary includes for wrapper.h

Signed-off-by: Calvin Wan <calvinwan@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Calvin Wan committed Jul 5, 2023 at 17:09 UTC da9502ff4dc495471a1a080dc297cd6e4628c10c
74 files changed -74
apply.c
-1
@@ -37,7 +37,6 @@
37 #include "symlinks.h"
38 #include "wildmatch.h"
39 #include "ws.h"
40 -#include "wrapper.h"
40
41 struct gitdiff_data {
42 struct strbuf *root;
builtin/am.c
-1
@@ -44,7 +44,6 @@
44 #include "path.h"
45 #include "repository.h"
46 #include "pretty.h"
47 -#include "wrapper.h"
47
48 /**
49 * Returns the length of the first line of msg.
builtin/bisect.c
-1
@@ -15,7 +15,6 @@
15 #include "prompt.h"
16 #include "quote.h"
17 #include "revision.h"
18 -#include "wrapper.h"
18
19 static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")
20 static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV")
builtin/branch.c
-1
@@ -28,7 +28,6 @@
28 #include "worktree.h"
29 #include "help.h"
30 #include "commit-reach.h"
31 -#include "wrapper.h"
31
32 static const char * const builtin_branch_usage[] = {
33 N_("git branch [<options>] [-r | -a] [--merged] [--no-merged]"),
builtin/bugreport.c
-1
@@ -11,7 +11,6 @@
11 #include "diagnose.h"
12 #include "object-file.h"
13 #include "setup.h"
14 -#include "wrapper.h"
14
15 static void get_system_info(struct strbuf *sys_info)
16 {
builtin/clone.c
-1
@@ -45,7 +45,6 @@
45 #include "hook.h"
46 #include "bundle.h"
47 #include "bundle-uri.h"
48 -#include "wrapper.h"
48
49 /*
50 * Overall FIXMEs:
builtin/config.c
-1
@@ -15,7 +15,6 @@
15 #include "setup.h"
16 #include "strbuf.h"
17 #include "worktree.h"
18 -#include "wrapper.h"
18
19 static const char *const builtin_config_usage[] = {
20 N_("git config [<options>]"),
builtin/credential-cache.c
-1
@@ -3,7 +3,6 @@
3 #include "parse-options.h"
4 #include "path.h"
5 #include "strbuf.h"
6 -#include "wrapper.h"
6 #include "write-or-die.h"
7
8 #ifndef NO_UNIX_SOCKETS
builtin/difftool.c
-1
@@ -32,7 +32,6 @@
32 #include "dir.h"
33 #include "entry.h"
34 #include "setup.h"
35 -#include "wrapper.h"
35
36 static int trust_exit_code;
37
builtin/fast-import.c
-1
@@ -26,7 +26,6 @@
26 #include "commit-reach.h"
27 #include "khash.h"
28 #include "date.h"
29 -#include "wrapper.h"
29
30 #define PACK_ID_BITS 16
31 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
builtin/fmt-merge-msg.c
-1
@@ -3,7 +3,6 @@
3 #include "fmt-merge-msg.h"
4 #include "gettext.h"
5 #include "parse-options.h"
6 -#include "wrapper.h"
6
7 static const char * const fmt_merge_msg_usage[] = {
8 N_("git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"),
builtin/gc.c
-1
@@ -41,7 +41,6 @@
41 #include "hook.h"
42 #include "setup.h"
43 #include "trace2.h"
44 -#include "wrapper.h"
44
45 #define FAILED_RUN "failed to run %s"
46
builtin/get-tar-commit-id.c
-1
@@ -5,7 +5,6 @@
5 #include "commit.h"
6 #include "tar.h"
7 #include "quote.h"
8 -#include "wrapper.h"
8
9 static const char builtin_get_tar_commit_id_usage[] =
10 "git get-tar-commit-id";
builtin/index-pack.c
-1
@@ -25,7 +25,6 @@
25 #include "replace-object.h"
26 #include "promisor-remote.h"
27 #include "setup.h"
28 -#include "wrapper.h"
28
29 static const char index_pack_usage[] =
30 "git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--[no-]rev-index] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
builtin/init-db.c
-1
@@ -13,7 +13,6 @@
13 #include "path.h"
14 #include "setup.h"
15 #include "strbuf.h"
16 -#include "wrapper.h"
16
17 static int guess_repository_type(const char *git_dir)
18 {
builtin/merge.c
-1
@@ -53,7 +53,6 @@
53 #include "commit-reach.h"
54 #include "wt-status.h"
55 #include "commit-graph.h"
56 -#include "wrapper.h"
56
57 #define DEFAULT_TWOHEAD (1<<0)
58 #define DEFAULT_OCTOPUS (1<<1)
builtin/pack-objects.c
-1
@@ -43,7 +43,6 @@
43 #include "promisor-remote.h"
44 #include "pack-mtimes.h"
45 #include "parse-options.h"
46 -#include "wrapper.h"
46
47 /*
48 * Objects we are going to pack are collected in the `to_pack` structure.
builtin/rebase.c
-1
@@ -37,7 +37,6 @@
37 #include "reset.h"
38 #include "trace2.h"
39 #include "hook.h"
40 -#include "wrapper.h"
40
41 static char const * const builtin_rebase_usage[] = {
42 N_("git rebase [-i] [options] [--exec <cmd>] "
builtin/receive-pack.c
-1
@@ -40,7 +40,6 @@
40 #include "worktree.h"
41 #include "shallow.h"
42 #include "parse-options.h"
43 -#include "wrapper.h"
43
44 static const char * const receive_pack_usage[] = {
45 N_("git receive-pack <git-dir>"),
builtin/rerere.c
-1
@@ -6,7 +6,6 @@
6 #include "repository.h"
7 #include "string-list.h"
8 #include "rerere.h"
9 -#include "wrapper.h"
9 #include "xdiff/xdiff.h"
10 #include "xdiff-interface.h"
11 #include "pathspec.h"
builtin/unpack-file.c
-1
@@ -3,7 +3,6 @@
3 #include "hex.h"
4 #include "object-name.h"
5 #include "object-store-ll.h"
6 -#include "wrapper.h"
6
7 static char *create_temp_file(struct object_id *oid)
8 {
builtin/worktree.c
-1
@@ -24,7 +24,6 @@
24 #include "submodule.h"
25 #include "utf8.h"
26 #include "worktree.h"
27 -#include "wrapper.h"
27 #include "quote.h"
28
29 #define BUILTIN_WORKTREE_ADD_USAGE \
bulk-checkin.c
-1
@@ -17,7 +17,6 @@
17 #include "packfile.h"
18 #include "object-file.h"
19 #include "object-store-ll.h"
20 -#include "wrapper.h"
20
21 static int odb_transaction_nesting;
22
combine-diff.c
-1
@@ -17,7 +17,6 @@
17 #include "userdiff.h"
18 #include "oid-array.h"
19 #include "revision.h"
20 -#include "wrapper.h"
20
21 static int compare_paths(const struct combine_diff_path *one,
22 const struct diff_filespec *two)
commit-graph.c
-1
@@ -26,7 +26,6 @@
26 #include "trace2.h"
27 #include "tree.h"
28 #include "chunk-format.h"
29 -#include "wrapper.h"
29
30 void git_test_write_commit_graph_or_die(void)
31 {
compat/terminal.c
-1
@@ -6,7 +6,6 @@
6 #include "run-command.h"
7 #include "string-list.h"
8 #include "hashmap.h"
9 -#include "wrapper.h"
9
10 #if defined(HAVE_DEV_TTY) || defined(GIT_WINDOWS_NATIVE)
11
config.c
-1
@@ -39,7 +39,6 @@
39 #include "wildmatch.h"
40 #include "worktree.h"
41 #include "ws.h"
42 -#include "wrapper.h"
42 #include "write-or-die.h"
43
44 struct config_source {
convert.c
-1
@@ -16,7 +16,6 @@
16 #include "trace.h"
17 #include "utf8.h"
18 #include "merge-ll.h"
19 -#include "wrapper.h"
19
20 /*
21 * convert.c - convert a file when checking it out and checking it in.
copy.c
-1
@@ -1,7 +1,6 @@
1 #include "git-compat-util.h"
2 #include "copy.h"
3 #include "path.h"
4 -#include "wrapper.h"
4
5 int copy_fd(int ifd, int ofd)
6 {
csum-file.c
-1
@@ -11,7 +11,6 @@
11 #include "progress.h"
12 #include "csum-file.h"
13 #include "hash.h"
14 -#include "wrapper.h"
14
15 static void verify_buffer_or_die(struct hashfile *f,
16 const void *buf,
daemon.c
-1
@@ -10,7 +10,6 @@
10 #include "setup.h"
11 #include "strbuf.h"
12 #include "string-list.h"
13 -#include "wrapper.h"
13
14 #ifdef NO_INITGROUPS
15 #define initgroups(x, y) (0) /* nothing */
diff.c
-1
@@ -43,7 +43,6 @@
43 #include "setup.h"
44 #include "strmap.h"
45 #include "ws.h"
46 -#include "wrapper.h"
46
47 #ifdef NO_FAST_WORKING_DIRECTORY
48 #define FAST_WORKING_DIRECTORY 0
dir.c
-1
@@ -32,7 +32,6 @@
32 #include "symlinks.h"
33 #include "trace2.h"
34 #include "tree.h"
35 -#include "wrapper.h"
35
36 /*
37 * Tells read_directory_recursive how a file or directory should be treated.
editor.c
-1
@@ -11,7 +11,6 @@
11 #include "strvec.h"
12 #include "run-command.h"
13 #include "sigchain.h"
14 -#include "wrapper.h"
14
15 #ifndef DEFAULT_EDITOR
16 #define DEFAULT_EDITOR "vi"
entry.c
-1
@@ -14,7 +14,6 @@
14 #include "fsmonitor.h"
15 #include "entry.h"
16 #include "parallel-checkout.h"
17 -#include "wrapper.h"
17
18 static void create_directories(const char *path, int path_len,
19 const struct checkout *state)
environment.c
-1
@@ -28,7 +28,6 @@
28 #include "setup.h"
29 #include "shallow.h"
30 #include "trace.h"
31 -#include "wrapper.h"
31 #include "write-or-die.h"
32
33 int trust_executable_bit = 1;
fetch-pack.c
-1
@@ -34,7 +34,6 @@
34 #include "commit-graph.h"
35 #include "sigchain.h"
36 #include "mergesort.h"
37 -#include "wrapper.h"
37
38 static int transfer_unpack_limit = -1;
39 static int fetch_unpack_limit = -1;
gpg-interface.c
-1
@@ -12,7 +12,6 @@
12 #include "sigchain.h"
13 #include "tempfile.h"
14 #include "alias.h"
15 -#include "wrapper.h"
15
16 static int git_gpg_config(const char *, const char *, void *);
17
grep.c
-1
@@ -12,7 +12,6 @@
12 #include "commit.h"
13 #include "quote.h"
14 #include "help.h"
15 -#include "wrapper.h"
15
16 static int grep_source_load(struct grep_source *gs);
17 static int grep_source_is_binary(struct grep_source *gs,
http-backend.c
-1
@@ -19,7 +19,6 @@
19 #include "object-store-ll.h"
20 #include "protocol.h"
21 #include "date.h"
22 -#include "wrapper.h"
22 #include "write-or-die.h"
23
24 static const char content_type[] = "Content-Type";
imap-send.c
-1
@@ -30,7 +30,6 @@
30 #include "parse-options.h"
31 #include "setup.h"
32 #include "strbuf.h"
33 -#include "wrapper.h"
33 #if defined(NO_OPENSSL) && !defined(HAVE_OPENSSL_CSPRNG)
34 typedef void *SSL;
35 #endif
merge-ll.c
-1
@@ -13,7 +13,6 @@
13 #include "merge-ll.h"
14 #include "quote.h"
15 #include "strbuf.h"
16 -#include "wrapper.h"
16
17 struct ll_merge_driver;
18
merge-recursive.c
-1
@@ -38,7 +38,6 @@
38 #include "tag.h"
39 #include "tree-walk.h"
40 #include "unpack-trees.h"
41 -#include "wrapper.h"
41 #include "xdiff-interface.h"
42
43 struct merge_options_internal {
notes-merge.c
-1
@@ -20,7 +20,6 @@
20 #include "trace.h"
21 #include "notes-utils.h"
22 #include "commit-reach.h"
23 -#include "wrapper.h"
23
24 struct notes_merge_pair {
25 struct object_id obj, base, local, remote;
object-file.c
-1
@@ -44,7 +44,6 @@
44 #include "setup.h"
45 #include "submodule.h"
46 #include "fsck.h"
47 -#include "wrapper.h"
47
48 /* The maximum size for an object header. */
49 #define MAX_HEADER_LEN 32
pack-write.c
-1
@@ -12,7 +12,6 @@
12 #include "pack-revindex.h"
13 #include "path.h"
14 #include "strbuf.h"
15 -#include "wrapper.h"
15
16 void reset_pack_idx_option(struct pack_idx_option *opts)
17 {
packfile.c
-1
@@ -24,7 +24,6 @@
24 #include "commit-graph.h"
25 #include "pack-revindex.h"
26 #include "promisor-remote.h"
27 -#include "wrapper.h"
27
28 char *odb_pack_name(struct strbuf *buf,
29 const unsigned char *hash,
parallel-checkout.c
-1
@@ -15,7 +15,6 @@
15 #include "symlinks.h"
16 #include "thread-utils.h"
17 #include "trace2.h"
18 -#include "wrapper.h"
18
19 struct pc_worker {
20 struct child_process cp;
path.c
-1
@@ -18,7 +18,6 @@
18 #include "object-store-ll.h"
19 #include "lockfile.h"
20 #include "exec-cmd.h"
21 -#include "wrapper.h"
21
22 static int get_st_mode_bits(const char *path, int *mode)
23 {
pkt-line.c
-1
@@ -5,7 +5,6 @@
5 #include "hex.h"
6 #include "run-command.h"
7 #include "trace.h"
8 -#include "wrapper.h"
8 #include "write-or-die.h"
9
10 char packet_buffer[LARGE_PACKET_MAX];
read-cache.c
-1
@@ -46,7 +46,6 @@
46 #include "csum-file.h"
47 #include "promisor-remote.h"
48 #include "hook.h"
49 -#include "wrapper.h"
49
50 /* Mask for the name length in ce_flags in the on-disk index */
51
rebase-interactive.c
-1
@@ -11,7 +11,6 @@
11 #include "config.h"
12 #include "dir.h"
13 #include "object-name.h"
14 -#include "wrapper.h"
14
15 static const char edit_todo_list_advice[] =
16 N_("You can fix this with 'git rebase --edit-todo' "
refs.c
-1
@@ -30,7 +30,6 @@
30 #include "date.h"
31 #include "commit.h"
32 #include "wildmatch.h"
33 -#include "wrapper.h"
33
34 /*
35 * List of all available backends
rerere.c
-1
@@ -20,7 +20,6 @@
20 #include "object-store-ll.h"
21 #include "hash-lookup.h"
22 #include "strmap.h"
23 -#include "wrapper.h"
23
24 #define RESOLVED 0
25 #define PUNTED 1
send-pack.c
-1
@@ -15,7 +15,6 @@
15 #include "quote.h"
16 #include "transport.h"
17 #include "version.h"
18 -#include "wrapper.h"
18 #include "oid-array.h"
19 #include "gpg-interface.h"
20 #include "shallow.h"
sequencer.c
-1
@@ -49,7 +49,6 @@
49 #include "rebase-interactive.h"
50 #include "reset.h"
51 #include "branch.h"
52 -#include "wrapper.h"
52
53 #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
54
server-info.c
-1
@@ -14,7 +14,6 @@
14 #include "object-store-ll.h"
15 #include "server-info.h"
16 #include "strbuf.h"
17 -#include "wrapper.h"
17
18 struct update_info_ctx {
19 FILE *cur_fp;
setup.c
-1
@@ -17,7 +17,6 @@
17 #include "quote.h"
18 #include "trace2.h"
19 #include "worktree.h"
20 -#include "wrapper.h"
20
21 static int inside_git_dir = -1;
22 static int inside_work_tree = -1;
shallow.c
-1
@@ -20,7 +20,6 @@
20 #include "shallow.h"
21 #include "statinfo.h"
22 #include "trace.h"
23 -#include "wrapper.h"
23
24 void set_alternate_shallow_file(struct repository *r, const char *path, int override)
25 {
strbuf.c
-1
@@ -11,7 +11,6 @@
11 #include "string-list.h"
12 #include "utf8.h"
13 #include "date.h"
14 -#include "wrapper.h"
14
15 int starts_with(const char *str, const char *prefix)
16 {
streaming.c
-1
@@ -10,7 +10,6 @@
10 #include "object-store-ll.h"
11 #include "replace-object.h"
12 #include "packfile.h"
13 -#include "wrapper.h"
13
14 typedef int (*open_istream_fn)(struct git_istream *,
15 struct repository *,
t/helper/test-delta.c
-1
@@ -11,7 +11,6 @@
11 #include "test-tool.h"
12 #include "git-compat-util.h"
13 #include "delta.h"
14 -#include "wrapper.h"
14
15 static const char usage_str[] =
16 "test-tool delta (-d|-p) <from_file> <data_file> <out_file>";
t/helper/test-fsmonitor-client.c
-1
@@ -11,7 +11,6 @@
11 #include "setup.h"
12 #include "thread-utils.h"
13 #include "trace2.h"
14 -#include "wrapper.h"
14
15 #ifndef HAVE_FSMONITOR_DAEMON_BACKEND
16 int cmd__fsmonitor_client(int argc UNUSED, const char **argv UNUSED)
t/helper/test-read-cache.c
-1
@@ -4,7 +4,6 @@
4 #include "read-cache-ll.h"
5 #include "repository.h"
6 #include "setup.h"
7 -#include "wrapper.h"
7
8 int cmd__read_cache(int argc, const char **argv)
9 {
tag.c
-1
@@ -10,7 +10,6 @@
10 #include "gpg-interface.h"
11 #include "hex.h"
12 #include "packfile.h"
13 -#include "wrapper.h"
13
14 const char *tag_type = "tag";
15
tempfile.c
-1
@@ -46,7 +46,6 @@
46 #include "path.h"
47 #include "tempfile.h"
48 #include "sigchain.h"
49 -#include "wrapper.h"
49
50 static VOLATILE_LIST_HEAD(tempfile_list);
51
trace.c
-1
@@ -27,7 +27,6 @@
27 #include "quote.h"
28 #include "setup.h"
29 #include "trace.h"
30 -#include "wrapper.h"
30
31 struct trace_key trace_default_key = { "GIT_TRACE", 0, 0, 0 };
32 struct trace_key trace_perf_key = TRACE_KEY_INIT(PERFORMANCE);
transport-helper.c
-1
@@ -19,7 +19,6 @@
19 #include "refspec.h"
20 #include "transport-internal.h"
21 #include "protocol.h"
22 -#include "wrapper.h"
22
23 static int debug;
24
transport.c
-1
@@ -30,7 +30,6 @@
30 #include "object-store-ll.h"
31 #include "color.h"
32 #include "bundle-uri.h"
33 -#include "wrapper.h"
33
34 static int transport_use_color = -1;
35 static char transport_colors[][COLOR_MAXLEN] = {
upload-pack.c
-1
@@ -32,7 +32,6 @@
32 #include "commit-graph.h"
33 #include "commit-reach.h"
34 #include "shallow.h"
35 -#include "wrapper.h"
35 #include "write-or-die.h"
36
37 /* Remember to update object flag allocation in object.h */
usage.c
-1
@@ -6,7 +6,6 @@
6 #include "git-compat-util.h"
7 #include "gettext.h"
8 #include "trace2.h"
9 -#include "wrapper.h"
9
10 static void vreportf(const char *prefix, const char *err, va_list params)
11 {
worktree.c
-1
@@ -12,7 +12,6 @@
12 #include "dir.h"
13 #include "wt-status.h"
14 #include "config.h"
15 -#include "wrapper.h"
15
16 void free_worktrees(struct worktree **worktrees)
17 {
wrapper.c
-1
@@ -9,7 +9,6 @@
9 #include "repository.h"
10 #include "strbuf.h"
11 #include "trace2.h"
12 -#include "wrapper.h"
12
13 static intmax_t count_fsync_writeout_only;
14 static intmax_t count_fsync_hardware_flush;
write-or-die.c
-1
@@ -1,7 +1,6 @@
1 #include "git-compat-util.h"
2 #include "config.h"
3 #include "run-command.h"
4 -#include "wrapper.h"
4 #include "write-or-die.h"
5
6 /*