From patchwork Sun Dec 3 06:41:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 13477202 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LmgszBjS" Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E07BFEB for ; Sat, 2 Dec 2023 22:41:27 -0800 (PST) Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3332efd75c9so2067318f8f.2 for ; Sat, 02 Dec 2023 22:41:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701585685; x=1702190485; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=GFKpsdp2o3YTXIe4JCGPsqVbXJJnbQVjI8qM+BqcSMc=; b=LmgszBjSmMsnAo8Mt9eVVmnRpIV5T1FZ52LRcvKpmfyAbJNiGcvmKy/qSsX/BQWwTM cRchRsOf6lrUAwUV1TUJoYAWPUowLze0ALX+bPObmjVasPkarUGp9mlj7PKBz1Z4wWqF pX/3av5ydLyT3oUB1bgnlwlfVybwjfqxL8YmrVCenQtfFgUU+D/yVtrqbS/iLKyIQv8V IH9dndPLfrI6CuhZVE7KooiFLKN9cqpDCKoYXygfam8xE4IncSiX8BAOHna780ukD/tj Ih0MwNW2evlm5e6awcYQ059v0EVb9usOudF2pHrw+U2hTDbX1lmjF8u0i8Wq7jKwTPi/ 4DYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701585685; x=1702190485; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GFKpsdp2o3YTXIe4JCGPsqVbXJJnbQVjI8qM+BqcSMc=; b=dEydykwc8N6rnmtJhAlnG7OV0PSbgdL1NFUf6QdwYOkM/eI56vbBX9GSLzN5nmOpnR Eo69xNPi4Ybf2AR8n+UySA3co9q0RsTFfUT7b2fp8DJvyLYDEP0HET3eEMfcLgNnQkxH ImeE8Vgz2VVC1VtutvHrzNU2YpQ4DuBTC+Rx6yZLXi3LqFyYIqJKn47vbL2Cd65ioQKh 5BJKmKmIDCSDLME2QK9T5Cibftm1+DCQBxa0crvha+lxUwG//7UJUTwqn8HGRhhJL1Rw 8abnAOzoX5ybo3y4py31wWgZZ3Ckx7VFcnlxAK3FR8vVWW/zXsQZ3d0KdNy6POm8hnPu 9FDg== X-Gm-Message-State: AOJu0Yze6BTaTQBGnMaDlCownN1BGdTmCGQ93KtKXT4GAeiCvSROrgK4 czP5gfN7oFHWUjXI2pCWOGOQeyl+aFQ= X-Google-Smtp-Source: AGHT+IFSgjV4iw5r2I2iiHTtFYTyVLgTyGEEa5aIuy9zrECPM+3XLG3UPgwPVZtS5D0cMykKuv1cNw== X-Received: by 2002:adf:f509:0:b0:333:3117:c45a with SMTP id q9-20020adff509000000b003333117c45amr1229534wro.235.1701585685246; Sat, 02 Dec 2023 22:41:25 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v9-20020a5d5909000000b003333bd63792sm2869706wrd.117.2023.12.02.22.41.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Dec 2023 22:41:25 -0800 (PST) Message-ID: <2f8ff69314e6fbff828ea63eae2362fc6e3dea25.1701585682.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 03 Dec 2023 06:41:10 +0000 Subject: [PATCH 01/12] treewide: remove unnecessary includes from header files Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Elijah Newren From: Elijah Newren From: Elijah Newren There are three kinds of unnecessary includes: * includes which aren't directly needed, but which include some other forgotten include * includes which could be replaced by a simple forward declaration of some structs * includes which aren't needed at all Remove the third kind of include. Subsequent commits (and a subsequent series) will work on removing some of the other kinds of includes. Signed-off-by: Elijah Newren --- fetch-pack.h | 1 - midx.h | 1 - ref-filter.h | 1 - submodule-config.h | 1 - 4 files changed, 4 deletions(-) diff --git a/fetch-pack.h b/fetch-pack.h index 8c7752fc821..6775d265175 100644 --- a/fetch-pack.h +++ b/fetch-pack.h @@ -2,7 +2,6 @@ #define FETCH_PACK_H #include "string-list.h" -#include "run-command.h" #include "protocol.h" #include "list-objects-filter-options.h" #include "oidset.h" diff --git a/midx.h b/midx.h index a5d98919c85..eb57a37519c 100644 --- a/midx.h +++ b/midx.h @@ -1,7 +1,6 @@ #ifndef MIDX_H #define MIDX_H -#include "repository.h" #include "string-list.h" struct object_id; diff --git a/ref-filter.h b/ref-filter.h index 1524bc463a5..4ecb6ab1c60 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -3,7 +3,6 @@ #include "gettext.h" #include "oid-array.h" -#include "refs.h" #include "commit.h" #include "string-list.h" #include "strvec.h" diff --git a/submodule-config.h b/submodule-config.h index 2a37689cc27..e8164cca3e4 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -2,7 +2,6 @@ #define SUBMODULE_CONFIG_CACHE_H #include "config.h" -#include "hashmap.h" #include "submodule.h" #include "strbuf.h" #include "tree-walk.h" From patchwork Sun Dec 3 06:41:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 13477214 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Z9SdZcQH" Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B551ED for ; Sat, 2 Dec 2023 22:41:29 -0800 (PST) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40c09f5a7cfso1065355e9.0 for ; Sat, 02 Dec 2023 22:41:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701585687; x=1702190487; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=/hnN0vFBreYgFpE3U5dP2rydLMxcxFq/j1LBCeQtz64=; b=Z9SdZcQHG3MLOohrLoFCDxYBuPHdOzIAD+8diTvyim0NzzTV7E9rqSqoT/XbWTVNDd scbFZ8iEuWkhhA+sqrt6KgKsuaoyI2fQdFb6eTvCMdMBVZ4CET8nj6qdCfjUyA2cDXUN X28iowmHnd+158i9hw8lJgsGYQHkbtYusT0DzYyXorcCriUpFtsdwQgHbIOrWhoQknK4 Nf8okNV5vx6P3jy++MnmBT1/xEpiIj/u1r3IvXyxIXdpLBHK3DZKiZ2VBL99AWD3hL3q uLLK9/Z6NTEVdem6CrBL1frRXqUEUNk88ePJNp3LA6ENYZe/11XRQppnSxyQMRT2vljP CBjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701585687; x=1702190487; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/hnN0vFBreYgFpE3U5dP2rydLMxcxFq/j1LBCeQtz64=; b=HztyF3rIfSSO8Zd8v1NyUCqeuTp0pPYPSGi88W4vQDaVWAz3a6UqrjDehaYpTNWkTH lHqBYNp8QLTqNXKJJmGSa+dhRfazo+P7GHiLd5YVl4QhkcBfuIDjf8+n6i/+s+6HzifB n/r8MO/nGuTO2x8UqxEiG+5hrDWutVOXZ8UTGojijXmzc47IdwtKDClou41tPSowEqpv etqeSKlbiV29Qh6pZ0Gx2HMTqudctWzwFMCaYaJXblW9XzjWcY2uLt93fecNRL17fY6V HxOuF1vr+KHUn4zxIjXNp6L/02/10ccK2ftrXyuO95OJkqZspG/B1DihJrHxbrXtnfOv z4NQ== X-Gm-Message-State: AOJu0Yxb+PsR+bfA5rKec748YdfBMElkQiuZok/Z2Xn41qzU6T6guRwY O4w96uQ/9vjtGTUfiUX+g5YJnFudSPE= X-Google-Smtp-Source: AGHT+IGl71i886urziVW8iuCyf6w0oT/TdLGE70QbtvJvWo/1dBPYEHZYpsPiyO18YtpCITHhwueLg== X-Received: by 2002:a05:600c:154e:b0:40b:5e21:ec16 with SMTP id f14-20020a05600c154e00b0040b5e21ec16mr1373051wmg.72.1701585686637; Sat, 02 Dec 2023 22:41:26 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id fb13-20020a05600c520d00b0040b3e7569fcsm14332973wmb.11.2023.12.02.22.41.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Dec 2023 22:41:25 -0800 (PST) Message-ID: In-Reply-To: References: Date: Sun, 03 Dec 2023 06:41:11 +0000 Subject: [PATCH 02/12] treewide: remove unnecessary includes in source files Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Elijah Newren From: Elijah Newren From: Elijah Newren Each of these were checked with gcc -E -I. ${SOURCE_FILE} | grep ${HEADER_FILE} to ensure that removing the direct inclusion of the header actually resulted in that header no longer being included at all (i.e. that no other header pulled it in transitively). ...except for a few cases where we verified that although the header was brought in transitively, nothing from it was directly used in that source file. These cases were: * builtin/credential-cache.c * builtin/pull.c * builtin/send-pack.c Signed-off-by: Elijah Newren --- add-patch.c | 1 - apply.c | 1 - archive.c | 1 - attr.c | 1 - bisect.c | 1 - blob.c | 1 - bloom.c | 1 - builtin/add.c | 3 --- builtin/am.c | 4 ---- builtin/apply.c | 1 - builtin/bisect.c | 1 - builtin/blame.c | 1 - builtin/branch.c | 3 --- builtin/cat-file.c | 1 - builtin/checkout-index.c | 1 - builtin/checkout.c | 3 --- builtin/clone.c | 1 - builtin/commit-graph.c | 1 - builtin/commit-tree.c | 3 --- builtin/commit.c | 8 -------- builtin/credential-cache.c | 2 -- builtin/describe.c | 2 -- builtin/diff-files.c | 1 - builtin/diff-index.c | 2 -- builtin/diff-tree.c | 1 - builtin/diff.c | 2 -- builtin/difftool.c | 1 - builtin/fast-export.c | 1 - builtin/fetch.c | 2 -- builtin/for-each-ref.c | 2 -- builtin/fsck.c | 2 -- builtin/get-tar-commit-id.c | 1 - builtin/grep.c | 3 --- builtin/hash-object.c | 1 - builtin/hook.c | 1 - builtin/index-pack.c | 2 -- builtin/init-db.c | 1 - builtin/log.c | 2 -- builtin/ls-files.c | 4 ---- builtin/ls-remote.c | 1 - builtin/ls-tree.c | 2 -- builtin/mailinfo.c | 1 - builtin/merge-base.c | 3 --- builtin/merge-recursive.c | 3 --- builtin/merge-tree.c | 1 - builtin/merge.c | 4 ---- builtin/mv.c | 1 - builtin/notes.c | 2 -- builtin/pack-objects.c | 3 --- builtin/pull.c | 5 ----- builtin/push.c | 1 - builtin/range-diff.c | 1 - builtin/read-tree.c | 2 -- builtin/rebase.c | 4 ---- builtin/receive-pack.c | 1 - builtin/repack.c | 1 - builtin/rerere.c | 1 - builtin/reset.c | 3 --- builtin/rev-list.c | 1 - builtin/revert.c | 2 -- builtin/rm.c | 1 - builtin/send-pack.c | 4 ---- builtin/show-ref.c | 1 - builtin/sparse-checkout.c | 4 ---- builtin/stash.c | 1 - builtin/submodule--helper.c | 1 - builtin/tag.c | 1 - builtin/unpack-objects.c | 4 ---- builtin/update-ref.c | 1 - builtin/verify-commit.c | 2 -- builtin/verify-tag.c | 1 - bulk-checkin.c | 1 - bundle-uri.c | 1 - cache-tree.c | 1 - combine-diff.c | 1 - commit-graph.c | 1 - commit-reach.c | 1 - commit.c | 2 -- config.c | 3 --- delta-islands.c | 5 ----- diff-lib.c | 1 - diff-no-index.c | 3 --- diff.c | 2 -- diffcore-break.c | 1 - diffcore-delta.c | 1 - dir.c | 1 - entry.c | 1 - exec-cmd.c | 1 - fetch-pack.c | 2 -- fsck.c | 1 - gettext.c | 2 -- gpg-interface.c | 1 - grep.c | 1 - http-fetch.c | 1 - http-push.c | 2 -- http-walker.c | 1 - http.c | 1 - imap-send.c | 2 -- line-log.c | 2 -- line-range.c | 1 - list-objects-filter-options.c | 5 ----- list-objects-filter.c | 5 ----- ls-refs.c | 1 - merge-blobs.c | 2 -- merge-ort.c | 2 -- merge-recursive.c | 5 ----- merge.c | 3 --- negotiator/noop.c | 1 - notes.c | 2 -- object-file.c | 8 -------- object-name.c | 2 -- pack-bitmap-write.c | 3 --- pack-check.c | 1 - pack-write.c | 1 - packfile.c | 1 - parse-options.c | 2 -- patch-ids.c | 1 - protocol-caps.c | 1 - reachable.c | 1 - read-cache.c | 2 -- ref-filter.c | 2 -- reflog.c | 1 - refs/files-backend.c | 2 -- refs/packed-backend.c | 1 - refs/ref-cache.c | 1 - reftable/dump.c | 2 -- reftable/generic.c | 1 - reftable/merged.c | 1 - reftable/merged_test.c | 1 - reftable/reader.c | 1 - reftable/readwrite_test.c | 1 - reftable/refname_test.c | 1 - reftable/stack_test.c | 1 - reftable/test_framework.c | 1 - reftable/tree_test.c | 2 -- remote-curl.c | 1 - remote.c | 1 - rerere.c | 2 -- reset.c | 1 - revision.c | 2 -- run-command.c | 2 -- send-pack.c | 2 -- sequencer.c | 3 --- setup.c | 1 - shallow.c | 1 - shell.c | 1 - submodule.c | 3 --- t/helper/test-bundle-uri.c | 2 -- t/helper/test-fast-rebase.c | 1 - t/helper/test-reach.c | 2 -- t/helper/test-repository.c | 1 - t/helper/test-simple-ipc.c | 1 - t/helper/test-trace2.c | 1 - tmp-objdir.c | 1 - trace2.c | 4 ---- transport-helper.c | 2 -- transport.c | 3 --- tree.c | 3 --- upload-pack.c | 6 ------ wrapper.c | 1 - xdiff-interface.c | 2 -- 161 files changed, 297 deletions(-) diff --git a/add-patch.c b/add-patch.c index bfe19876cd5..79eda168ebb 100644 --- a/add-patch.c +++ b/add-patch.c @@ -12,7 +12,6 @@ #include "strvec.h" #include "pathspec.h" #include "color.h" -#include "diff.h" #include "compat/terminal.h" #include "prompt.h" diff --git a/apply.c b/apply.c index 3d69fec836d..7608e3301ca 100644 --- a/apply.c +++ b/apply.c @@ -12,7 +12,6 @@ #include "base85.h" #include "config.h" #include "object-store-ll.h" -#include "blob.h" #include "delta.h" #include "diff.h" #include "dir.h" diff --git a/archive.c b/archive.c index ca11db185b1..4562a69a0cc 100644 --- a/archive.c +++ b/archive.c @@ -17,7 +17,6 @@ #include "archive.h" #include "parse-options.h" #include "unpack-trees.h" -#include "dir.h" #include "quote.h" static char const * const archive_usage[] = { diff --git a/attr.c b/attr.c index e62876dfd3e..0e4cdbd6959 100644 --- a/attr.c +++ b/attr.c @@ -17,7 +17,6 @@ #include "utf8.h" #include "quote.h" #include "read-cache-ll.h" -#include "revision.h" #include "object-store-ll.h" #include "setup.h" #include "thread-utils.h" diff --git a/bisect.c b/bisect.c index 1be8e0a2711..8487f8cd1bd 100644 --- a/bisect.c +++ b/bisect.c @@ -9,7 +9,6 @@ #include "refs.h" #include "list-objects.h" #include "quote.h" -#include "hash-lookup.h" #include "run-command.h" #include "log-tree.h" #include "bisect.h" diff --git a/blob.c b/blob.c index 888e28a5594..3fb2922b1ae 100644 --- a/blob.c +++ b/blob.c @@ -1,6 +1,5 @@ #include "git-compat-util.h" #include "blob.h" -#include "repository.h" #include "alloc.h" const char *blob_type = "blob"; diff --git a/bloom.c b/bloom.c index 1474aa19fa5..e529f7605ca 100644 --- a/bloom.c +++ b/bloom.c @@ -2,7 +2,6 @@ #include "bloom.h" #include "diff.h" #include "diffcore.h" -#include "revision.h" #include "hashmap.h" #include "commit-graph.h" #include "commit.h" diff --git a/builtin/add.c b/builtin/add.c index 5126d2ede3d..2151c45fbf0 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -12,14 +12,11 @@ #include "dir.h" #include "gettext.h" #include "pathspec.h" -#include "exec-cmd.h" -#include "cache-tree.h" #include "run-command.h" #include "parse-options.h" #include "path.h" #include "preload-index.h" #include "diff.h" -#include "diffcore.h" #include "read-cache.h" #include "repository.h" #include "revision.h" diff --git a/builtin/am.c b/builtin/am.c index 9f084d58bc7..d1990d7edcb 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -10,7 +10,6 @@ #include "config.h" #include "editor.h" #include "environment.h" -#include "exec-cmd.h" #include "gettext.h" #include "hex.h" #include "parse-options.h" @@ -24,7 +23,6 @@ #include "refs.h" #include "commit.h" #include "diff.h" -#include "diffcore.h" #include "unpack-trees.h" #include "branch.h" #include "object-name.h" @@ -35,11 +33,9 @@ #include "log-tree.h" #include "notes-utils.h" #include "rerere.h" -#include "prompt.h" #include "mailinfo.h" #include "apply.h" #include "string-list.h" -#include "packfile.h" #include "pager.h" #include "path.h" #include "repository.h" diff --git a/builtin/apply.c b/builtin/apply.c index c18b7ea5d3d..861a01910ca 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -1,6 +1,5 @@ #include "builtin.h" #include "gettext.h" -#include "parse-options.h" #include "repository.h" #include "apply.h" diff --git a/builtin/bisect.c b/builtin/bisect.c index 35938b05fd1..7d5faedfabf 100644 --- a/builtin/bisect.c +++ b/builtin/bisect.c @@ -7,7 +7,6 @@ #include "parse-options.h" #include "bisect.h" #include "refs.h" -#include "dir.h" #include "strvec.h" #include "run-command.h" #include "oid-array.h" diff --git a/builtin/blame.c b/builtin/blame.c index 9c987d65675..e9ea190baf6 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -25,7 +25,6 @@ #include "userdiff.h" #include "line-range.h" #include "line-log.h" -#include "dir.h" #include "progress.h" #include "object-name.h" #include "object-store-ll.h" diff --git a/builtin/branch.c b/builtin/branch.c index e7ee9bd0f15..6e30d5eac53 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -17,13 +17,10 @@ #include "remote.h" #include "parse-options.h" #include "branch.h" -#include "diff.h" #include "path.h" -#include "revision.h" #include "string-list.h" #include "column.h" #include "utf8.h" -#include "wt-status.h" #include "ref-filter.h" #include "worktree.h" #include "help.h" diff --git a/builtin/cat-file.c b/builtin/cat-file.c index ea8ad601ecc..7d4899348a3 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -15,7 +15,6 @@ #include "parse-options.h" #include "userdiff.h" #include "streaming.h" -#include "tree-walk.h" #include "oid-array.h" #include "packfile.h" #include "object-file.h" diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c index 3b68b476153..2e086a204dc 100644 --- a/builtin/checkout-index.c +++ b/builtin/checkout-index.c @@ -7,7 +7,6 @@ #define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" -#include "dir.h" #include "gettext.h" #include "lockfile.h" #include "quote.h" diff --git a/builtin/checkout.c b/builtin/checkout.c index f02434bc155..12a46da89a8 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1,7 +1,6 @@ #define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "advice.h" -#include "blob.h" #include "branch.h" #include "cache-tree.h" #include "checkout.h" @@ -27,10 +26,8 @@ #include "remote.h" #include "resolve-undo.h" #include "revision.h" -#include "run-command.h" #include "setup.h" #include "submodule.h" -#include "submodule-config.h" #include "symlinks.h" #include "trace2.h" #include "tree.h" diff --git a/builtin/clone.c b/builtin/clone.c index c6357af9498..8e9c055533b 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -19,7 +19,6 @@ #include "hex.h" #include "lockfile.h" #include "parse-options.h" -#include "fetch-pack.h" #include "refs.h" #include "refspec.h" #include "object-file.h" diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index 45d035af600..c5684342ecf 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -1,7 +1,6 @@ #include "builtin.h" #include "commit.h" #include "config.h" -#include "dir.h" #include "environment.h" #include "gettext.h" #include "hex.h" diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c index 02625e71761..1bb78198392 100644 --- a/builtin/commit-tree.c +++ b/builtin/commit-tree.c @@ -11,9 +11,6 @@ #include "object-store-ll.h" #include "repository.h" #include "commit.h" -#include "tree.h" -#include "utf8.h" -#include "gpg-interface.h" #include "parse-options.h" static const char * const commit_tree_usage[] = { diff --git a/builtin/commit.c b/builtin/commit.c index 781af2e206c..ca2d18532ad 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -16,17 +16,12 @@ #include "editor.h" #include "environment.h" #include "diff.h" -#include "diffcore.h" #include "commit.h" #include "gettext.h" #include "revision.h" #include "wt-status.h" #include "run-command.h" -#include "hook.h" -#include "refs.h" -#include "log-tree.h" #include "strbuf.h" -#include "utf8.h" #include "object-name.h" #include "parse-options.h" #include "path.h" @@ -35,9 +30,6 @@ #include "string-list.h" #include "rerere.h" #include "unpack-trees.h" -#include "quote.h" -#include "submodule.h" -#include "gpg-interface.h" #include "column.h" #include "sequencer.h" #include "sparse-index.h" diff --git a/builtin/credential-cache.c b/builtin/credential-cache.c index 43b9d0e5b16..bba96d4ffd6 100644 --- a/builtin/credential-cache.c +++ b/builtin/credential-cache.c @@ -7,8 +7,6 @@ #ifndef NO_UNIX_SOCKETS -#include "credential.h" -#include "string-list.h" #include "unix-socket.h" #include "run-command.h" diff --git a/builtin/describe.c b/builtin/describe.c index fb6b0508f32..d6c77a714f4 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -7,9 +7,7 @@ #include "lockfile.h" #include "commit.h" #include "tag.h" -#include "blob.h" #include "refs.h" -#include "exec-cmd.h" #include "object-name.h" #include "parse-options.h" #include "read-cache-ll.h" diff --git a/builtin/diff-files.c b/builtin/diff-files.c index f38912cd407..018011f29ea 100644 --- a/builtin/diff-files.c +++ b/builtin/diff-files.c @@ -11,7 +11,6 @@ #include "preload-index.h" #include "repository.h" #include "revision.h" -#include "submodule.h" static const char diff_files_usage[] = "git diff-files [-q] [-0 | -1 | -2 | -3 | -c | --cc] [] [...]" diff --git a/builtin/diff-index.c b/builtin/diff-index.c index 220f341ffa2..3e05260ac0e 100644 --- a/builtin/diff-index.c +++ b/builtin/diff-index.c @@ -7,8 +7,6 @@ #include "repository.h" #include "revision.h" #include "setup.h" -#include "sparse-index.h" -#include "submodule.h" static const char diff_cache_usage[] = "git diff-index [-m] [--cached] [--merge-base] " diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index 86be6342861..a8e68ce8ef6 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -6,7 +6,6 @@ #include "gettext.h" #include "hex.h" #include "log-tree.h" -#include "submodule.h" #include "read-cache-ll.h" #include "repository.h" #include "revision.h" diff --git a/builtin/diff.c b/builtin/diff.c index 55e7d21755a..6e196e0c7d2 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -10,7 +10,6 @@ #include "lockfile.h" #include "color.h" #include "commit.h" -#include "blob.h" #include "gettext.h" #include "tag.h" #include "diff.h" @@ -21,7 +20,6 @@ #include "revision.h" #include "log-tree.h" #include "setup.h" -#include "submodule.h" #include "oid-array.h" #include "tree.h" diff --git a/builtin/difftool.c b/builtin/difftool.c index 0f5eae9cd41..a3c72b8258e 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -18,7 +18,6 @@ #include "copy.h" #include "run-command.h" #include "environment.h" -#include "exec-cmd.h" #include "gettext.h" #include "hex.h" #include "parse-options.h" diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 70aff515acb..f18f0809f9c 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -25,7 +25,6 @@ #include "quote.h" #include "remote.h" #include "blob.h" -#include "commit-slab.h" static const char *fast_export_usage[] = { N_("git fast-export []"), diff --git a/builtin/fetch.c b/builtin/fetch.c index fd134ba74d9..72d735589a3 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -26,7 +26,6 @@ #include "connected.h" #include "strvec.h" #include "utf8.h" -#include "packfile.h" #include "pager.h" #include "path.h" #include "pkt-line.h" @@ -38,7 +37,6 @@ #include "shallow.h" #include "trace.h" #include "trace2.h" -#include "worktree.h" #include "bundle-uri.h" #define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000) diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index 350bfa6e811..6235d72f9d3 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -1,13 +1,11 @@ #include "builtin.h" #include "config.h" #include "gettext.h" -#include "refs.h" #include "object.h" #include "parse-options.h" #include "ref-filter.h" #include "strbuf.h" #include "strvec.h" -#include "commit-reach.h" static char const * const for_each_ref_usage[] = { N_("git for-each-ref [] []"), diff --git a/builtin/fsck.c b/builtin/fsck.c index 611925905e4..9317b7b841d 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -13,10 +13,8 @@ #include "tree-walk.h" #include "fsck.h" #include "parse-options.h" -#include "dir.h" #include "progress.h" #include "streaming.h" -#include "decorate.h" #include "packfile.h" #include "object-file.h" #include "object-name.h" diff --git a/builtin/get-tar-commit-id.c b/builtin/get-tar-commit-id.c index 20d0dfe9cf1..66a7389f9f4 100644 --- a/builtin/get-tar-commit-id.c +++ b/builtin/get-tar-commit-id.c @@ -4,7 +4,6 @@ #include "builtin.h" #include "commit.h" #include "tar.h" -#include "quote.h" static const char builtin_get_tar_commit_id_usage[] = "git get-tar-commit-id"; diff --git a/builtin/grep.c b/builtin/grep.c index fe78d4c98b1..f076cc705b4 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -9,9 +9,6 @@ #include "hex.h" #include "repository.h" #include "config.h" -#include "blob.h" -#include "tree.h" -#include "commit.h" #include "tag.h" #include "tree-walk.h" #include "parse-options.h" diff --git a/builtin/hash-object.c b/builtin/hash-object.c index 5ffec99dcea..82ca6d2bfdc 100644 --- a/builtin/hash-object.c +++ b/builtin/hash-object.c @@ -14,7 +14,6 @@ #include "blob.h" #include "quote.h" #include "parse-options.h" -#include "exec-cmd.h" #include "setup.h" #include "strbuf.h" #include "write-or-die.h" diff --git a/builtin/hook.c b/builtin/hook.c index 09b51a6487c..5234693a94b 100644 --- a/builtin/hook.c +++ b/builtin/hook.c @@ -3,7 +3,6 @@ #include "gettext.h" #include "hook.h" #include "parse-options.h" -#include "strbuf.h" #include "strvec.h" #define BUILTIN_HOOK_RUN_USAGE \ diff --git a/builtin/index-pack.c b/builtin/index-pack.c index dda94a9f46d..0841b6940a3 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -8,11 +8,9 @@ #include "csum-file.h" #include "blob.h" #include "commit.h" -#include "tag.h" #include "tree.h" #include "progress.h" #include "fsck.h" -#include "exec-cmd.h" #include "strbuf.h" #include "streaming.h" #include "thread-utils.h" diff --git a/builtin/init-db.c b/builtin/init-db.c index cb727c826f5..b89814a6f87 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -5,7 +5,6 @@ */ #include "builtin.h" #include "abspath.h" -#include "config.h" #include "environment.h" #include "gettext.h" #include "object-file.h" diff --git a/builtin/log.c b/builtin/log.c index ba775d7b5cf..cec7ce46f1c 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -26,7 +26,6 @@ #include "tag.h" #include "reflog-walk.h" #include "patch-ids.h" -#include "run-command.h" #include "shortlog.h" #include "remote.h" #include "string-list.h" @@ -36,7 +35,6 @@ #include "streaming.h" #include "version.h" #include "mailmap.h" -#include "gpg-interface.h" #include "progress.h" #include "commit-slab.h" #include "repository.h" diff --git a/builtin/ls-files.c b/builtin/ls-files.c index a0229c32778..92f94e65bf0 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -14,19 +14,15 @@ #include "gettext.h" #include "object-name.h" #include "strbuf.h" -#include "tree.h" -#include "cache-tree.h" #include "parse-options.h" #include "resolve-undo.h" #include "string-list.h" #include "path.h" #include "pathspec.h" #include "read-cache.h" -#include "run-command.h" #include "setup.h" #include "sparse-index.h" #include "submodule.h" -#include "submodule-config.h" #include "object-store.h" #include "hex.h" diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c index fc765754305..2975ea4082f 100644 --- a/builtin/ls-remote.c +++ b/builtin/ls-remote.c @@ -5,7 +5,6 @@ #include "pkt-line.h" #include "ref-filter.h" #include "remote.h" -#include "refs.h" #include "parse-options.h" #include "wildmatch.h" diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index 209d2dc0d59..e4a891337c3 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -9,9 +9,7 @@ #include "hex.h" #include "object-name.h" #include "object-store-ll.h" -#include "blob.h" #include "tree.h" -#include "commit.h" #include "path.h" #include "quote.h" #include "parse-options.h" diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c index 53b55dd71c0..53a22645da5 100644 --- a/builtin/mailinfo.c +++ b/builtin/mailinfo.c @@ -6,7 +6,6 @@ #include "abspath.h" #include "environment.h" #include "gettext.h" -#include "utf8.h" #include "strbuf.h" #include "mailinfo.h" #include "parse-options.h" diff --git a/builtin/merge-base.c b/builtin/merge-base.c index e68b7fe45d7..d26e8fbf6f7 100644 --- a/builtin/merge-base.c +++ b/builtin/merge-base.c @@ -3,9 +3,6 @@ #include "commit.h" #include "gettext.h" #include "hex.h" -#include "refs.h" -#include "diff.h" -#include "revision.h" #include "object-name.h" #include "parse-options.h" #include "repository.h" diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c index 3366699657c..c2ce044a201 100644 --- a/builtin/merge-recursive.c +++ b/builtin/merge-recursive.c @@ -1,13 +1,10 @@ #include "builtin.h" #include "advice.h" -#include "commit.h" #include "gettext.h" #include "hash.h" -#include "tag.h" #include "merge-recursive.h" #include "object-name.h" #include "repository.h" -#include "xdiff-interface.h" static const char builtin_merge_recursive_usage[] = "git %s ... -- ..."; diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index a35e0452d66..f3c46691010 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -13,7 +13,6 @@ #include "parse-options.h" #include "repository.h" #include "blob.h" -#include "exec-cmd.h" #include "merge-blobs.h" #include "quote.h" #include "tree.h" diff --git a/builtin/merge.c b/builtin/merge.c index d748d46e135..5b788546637 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -31,8 +31,6 @@ #include "unpack-trees.h" #include "cache-tree.h" #include "dir.h" -#include "utf8.h" -#include "log-tree.h" #include "color.h" #include "rerere.h" #include "help.h" @@ -42,10 +40,8 @@ #include "resolve-undo.h" #include "remote.h" #include "fmt-merge-msg.h" -#include "gpg-interface.h" #include "sequencer.h" #include "string-list.h" -#include "packfile.h" #include "tag.h" #include "alias.h" #include "branch.h" diff --git a/builtin/mv.c b/builtin/mv.c index c596515ad05..22e64fc2900 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -15,7 +15,6 @@ #include "pathspec.h" #include "lockfile.h" #include "dir.h" -#include "cache-tree.h" #include "string-list.h" #include "parse-options.h" #include "read-cache-ll.h" diff --git a/builtin/notes.c b/builtin/notes.c index 9f38863dd50..e65cae0bcf7 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -9,7 +9,6 @@ #include "builtin.h" #include "config.h" -#include "alloc.h" #include "editor.h" #include "environment.h" #include "gettext.h" @@ -19,7 +18,6 @@ #include "object-store-ll.h" #include "path.h" #include "repository.h" -#include "blob.h" #include "pretty.h" #include "refs.h" #include "exec-cmd.h" diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 89a8b5a9768..ab1c9de9815 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -6,10 +6,8 @@ #include "config.h" #include "attr.h" #include "object.h" -#include "blob.h" #include "commit.h" #include "tag.h" -#include "tree.h" #include "delta.h" #include "pack.h" #include "pack-revindex.h" @@ -18,7 +16,6 @@ #include "diff.h" #include "revision.h" #include "list-objects.h" -#include "list-objects-filter.h" #include "list-objects-filter-options.h" #include "pack-objects.h" #include "progress.h" diff --git a/builtin/pull.c b/builtin/pull.c index be2b2c9ebc9..73a68b75b06 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -14,7 +14,6 @@ #include "merge.h" #include "object-name.h" #include "parse-options.h" -#include "exec-cmd.h" #include "run-command.h" #include "oid-array.h" #include "remote.h" @@ -24,15 +23,11 @@ #include "rebase.h" #include "refs.h" #include "refspec.h" -#include "revision.h" #include "submodule.h" #include "submodule-config.h" -#include "tempfile.h" -#include "lockfile.h" #include "wt-status.h" #include "commit-reach.h" #include "sequencer.h" -#include "packfile.h" /** * Parses the value of --rebase. If value is a false value, returns diff --git a/builtin/push.c b/builtin/push.c index 2e708383c24..23e841d5b54 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -7,7 +7,6 @@ #include "config.h" #include "environment.h" #include "gettext.h" -#include "refs.h" #include "refspec.h" #include "run-command.h" #include "remote.h" diff --git a/builtin/range-diff.c b/builtin/range-diff.c index e455a4795cc..f02cbac087d 100644 --- a/builtin/range-diff.c +++ b/builtin/range-diff.c @@ -5,7 +5,6 @@ #include "range-diff.h" #include "config.h" #include "repository.h" -#include "revision.h" static const char * const builtin_range_diff_usage[] = { N_("git range-diff [] .. .."), diff --git a/builtin/read-tree.c b/builtin/read-tree.c index 8196ca9dd85..20e7db19737 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -16,14 +16,12 @@ #include "tree-walk.h" #include "cache-tree.h" #include "unpack-trees.h" -#include "dir.h" #include "parse-options.h" #include "repository.h" #include "resolve-undo.h" #include "setup.h" #include "sparse-index.h" #include "submodule.h" -#include "submodule-config.h" static int nr_trees; static int read_empty; diff --git a/builtin/rebase.c b/builtin/rebase.c index 043c65dccd9..d338b4053da 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -11,14 +11,10 @@ #include "gettext.h" #include "hex.h" #include "run-command.h" -#include "exec-cmd.h" #include "strvec.h" #include "dir.h" -#include "packfile.h" #include "refs.h" -#include "quote.h" #include "config.h" -#include "cache-tree.h" #include "unpack-trees.h" #include "lockfile.h" #include "object-file.h" diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 8c4f0cb90a9..401d93b675f 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -22,7 +22,6 @@ #include "connected.h" #include "strvec.h" #include "version.h" -#include "tag.h" #include "gpg-interface.h" #include "sigchain.h" #include "fsck.h" diff --git a/builtin/repack.c b/builtin/repack.c index edaee4dbec7..fc10570d06b 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -8,7 +8,6 @@ #include "path.h" #include "run-command.h" #include "server-info.h" -#include "sigchain.h" #include "strbuf.h" #include "string-list.h" #include "strvec.h" diff --git a/builtin/rerere.c b/builtin/rerere.c index 07a9d37275c..b2efc6f640e 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -1,6 +1,5 @@ #include "builtin.h" #include "config.h" -#include "dir.h" #include "gettext.h" #include "parse-options.h" #include "repository.h" diff --git a/builtin/reset.c b/builtin/reset.c index 4b018d20e3b..8390bfe4c48 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -16,10 +16,8 @@ #include "hash.h" #include "hex.h" #include "lockfile.h" -#include "tag.h" #include "object.h" #include "pretty.h" -#include "run-command.h" #include "refs.h" #include "diff.h" #include "diffcore.h" @@ -33,7 +31,6 @@ #include "setup.h" #include "sparse-index.h" #include "submodule.h" -#include "submodule-config.h" #include "trace.h" #include "trace2.h" #include "dir.h" diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 181353dcf51..460ba7cbaa7 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -7,7 +7,6 @@ #include "hex.h" #include "revision.h" #include "list-objects.h" -#include "list-objects-filter.h" #include "list-objects-filter-options.h" #include "object.h" #include "object-name.h" diff --git a/builtin/revert.c b/builtin/revert.c index e6f9a1ad267..89821bab957 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -1,5 +1,4 @@ #include "git-compat-util.h" -#include "config.h" #include "builtin.h" #include "parse-options.h" #include "diff.h" @@ -7,7 +6,6 @@ #include "repository.h" #include "revision.h" #include "rerere.h" -#include "dir.h" #include "sequencer.h" #include "branch.h" diff --git a/builtin/rm.c b/builtin/rm.c index dff819ae509..fd130cea2d2 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -9,7 +9,6 @@ #include "config.h" #include "lockfile.h" #include "dir.h" -#include "cache-tree.h" #include "gettext.h" #include "hash.h" #include "tree-walk.h" diff --git a/builtin/send-pack.c b/builtin/send-pack.c index cd6d9e41129..395f2e490d4 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -1,8 +1,6 @@ #include "builtin.h" #include "config.h" -#include "commit.h" #include "hex.h" -#include "refs.h" #include "pkt-line.h" #include "sideband.h" #include "run-command.h" @@ -11,9 +9,7 @@ #include "send-pack.h" #include "quote.h" #include "transport.h" -#include "version.h" #include "oid-array.h" -#include "gpg-interface.h" #include "gettext.h" #include "protocol.h" #include "parse-options.h" diff --git a/builtin/show-ref.c b/builtin/show-ref.c index 7aac525a878..f102f6f6131 100644 --- a/builtin/show-ref.c +++ b/builtin/show-ref.c @@ -6,7 +6,6 @@ #include "object-name.h" #include "object-store-ll.h" #include "object.h" -#include "tag.h" #include "string-list.h" #include "parse-options.h" diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c index 5c8ffb1f759..80227f3df17 100644 --- a/builtin/sparse-checkout.c +++ b/builtin/sparse-checkout.c @@ -8,14 +8,10 @@ #include "parse-options.h" #include "pathspec.h" #include "repository.h" -#include "run-command.h" #include "strbuf.h" #include "string-list.h" -#include "cache-tree.h" #include "lockfile.h" -#include "resolve-undo.h" #include "unpack-trees.h" -#include "wt-status.h" #include "quote.h" #include "setup.h" #include "sparse-index.h" diff --git a/builtin/stash.c b/builtin/stash.c index 4a6771c9f4c..b2813c614cb 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -26,7 +26,6 @@ #include "sparse-index.h" #include "log-tree.h" #include "diffcore.h" -#include "exec-cmd.h" #include "reflog.h" #include "add-interactive.h" diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index cce46450abe..fda50f2af1e 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -22,7 +22,6 @@ #include "remote.h" #include "refs.h" #include "refspec.h" -#include "connect.h" #include "revision.h" #include "diffcore.h" #include "diff.h" diff --git a/builtin/tag.c b/builtin/tag.c index 3918eacbb57..358b3086161 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -18,7 +18,6 @@ #include "object-store-ll.h" #include "path.h" #include "tag.h" -#include "run-command.h" #include "parse-options.h" #include "diff.h" #include "revision.h" diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index fef74234488..e0a701f2b38 100644 --- a/builtin/unpack-objects.c +++ b/builtin/unpack-objects.c @@ -10,12 +10,8 @@ #include "delta.h" #include "pack.h" #include "blob.h" -#include "commit.h" #include "replace-object.h" #include "strbuf.h" -#include "tag.h" -#include "tree.h" -#include "tree-walk.h" #include "progress.h" #include "decorate.h" #include "fsck.h" diff --git a/builtin/update-ref.c b/builtin/update-ref.c index c0c4e65e6fb..61338a01ecf 100644 --- a/builtin/update-ref.c +++ b/builtin/update-ref.c @@ -7,7 +7,6 @@ #include "parse-options.h" #include "quote.h" #include "repository.h" -#include "strvec.h" static const char * const git_update_ref_usage[] = { N_("git update-ref [] -d []"), diff --git a/builtin/verify-commit.c b/builtin/verify-commit.c index 9680b587013..0d2b9aea2ae 100644 --- a/builtin/verify-commit.c +++ b/builtin/verify-commit.c @@ -9,10 +9,8 @@ #include "config.h" #include "gettext.h" #include "object-name.h" -#include "object-store-ll.h" #include "repository.h" #include "commit.h" -#include "run-command.h" #include "parse-options.h" #include "gpg-interface.h" diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c index d8753270ebe..c731e2f87b4 100644 --- a/builtin/verify-tag.c +++ b/builtin/verify-tag.c @@ -9,7 +9,6 @@ #include "config.h" #include "gettext.h" #include "tag.h" -#include "run-command.h" #include "object-name.h" #include "parse-options.h" #include "gpg-interface.h" diff --git a/bulk-checkin.c b/bulk-checkin.c index 6ce62999e58..eb46b886379 100644 --- a/bulk-checkin.c +++ b/bulk-checkin.c @@ -11,7 +11,6 @@ #include "csum-file.h" #include "pack.h" #include "strbuf.h" -#include "string-list.h" #include "tmp-objdir.h" #include "packfile.h" #include "object-file.h" diff --git a/bundle-uri.c b/bundle-uri.c index 8492fffd2f7..ca32050a78f 100644 --- a/bundle-uri.c +++ b/bundle-uri.c @@ -4,7 +4,6 @@ #include "copy.h" #include "environment.h" #include "gettext.h" -#include "object-store-ll.h" #include "refs.h" #include "run-command.h" #include "hashmap.h" diff --git a/cache-tree.c b/cache-tree.c index 641427ed410..64678fe1993 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -11,7 +11,6 @@ #include "read-cache-ll.h" #include "replace-object.h" #include "promisor-remote.h" -#include "sparse-index.h" #include "trace.h" #include "trace2.h" diff --git a/combine-diff.c b/combine-diff.c index f90f4424829..db94581f724 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -2,7 +2,6 @@ #include "object-store-ll.h" #include "commit.h" #include "convert.h" -#include "blob.h" #include "diff.h" #include "diffcore.h" #include "environment.h" diff --git a/commit-graph.c b/commit-graph.c index ee66098e077..5bfee53e87b 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -8,7 +8,6 @@ #include "commit.h" #include "object.h" #include "refs.h" -#include "revision.h" #include "hash-lookup.h" #include "commit-graph.h" #include "object-file.h" diff --git a/commit-reach.c b/commit-reach.c index a868a575ea1..ecc913fc99b 100644 --- a/commit-reach.c +++ b/commit-reach.c @@ -4,7 +4,6 @@ #include "decorate.h" #include "hex.h" #include "prio-queue.h" -#include "tree.h" #include "ref-filter.h" #include "revision.h" #include "tag.h" diff --git a/commit.c b/commit.c index 8405d7c3fce..f6342d7deb5 100644 --- a/commit.c +++ b/commit.c @@ -8,7 +8,6 @@ #include "repository.h" #include "object-name.h" #include "object-store-ll.h" -#include "pkt-line.h" #include "utf8.h" #include "diff.h" #include "revision.h" @@ -23,7 +22,6 @@ #include "advice.h" #include "refs.h" #include "commit-reach.h" -#include "run-command.h" #include "setup.h" #include "shallow.h" #include "tree.h" diff --git a/config.c b/config.c index b330c7adb4a..cdc39cf3693 100644 --- a/config.c +++ b/config.c @@ -30,15 +30,12 @@ #include "pager.h" #include "path.h" #include "utf8.h" -#include "dir.h" #include "color.h" -#include "replace-object.h" #include "refs.h" #include "setup.h" #include "strvec.h" #include "trace2.h" #include "wildmatch.h" -#include "worktree.h" #include "ws.h" #include "write-or-die.h" diff --git a/delta-islands.c b/delta-islands.c index 5de5759f3f1..ee2318d45a1 100644 --- a/delta-islands.c +++ b/delta-islands.c @@ -1,18 +1,13 @@ #include "git-compat-util.h" -#include "attr.h" #include "object.h" -#include "blob.h" #include "commit.h" #include "gettext.h" #include "hex.h" #include "tag.h" #include "tree.h" -#include "delta.h" #include "pack.h" #include "tree-walk.h" #include "diff.h" -#include "revision.h" -#include "list-objects.h" #include "progress.h" #include "refs.h" #include "khash.h" diff --git a/diff-lib.c b/diff-lib.c index 0e9ec4f68af..8fde93d7cac 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -2,7 +2,6 @@ * Copyright (C) 2005 Junio C Hamano */ #include "git-compat-util.h" -#include "quote.h" #include "commit.h" #include "diff.h" #include "diffcore.h" diff --git a/diff-no-index.c b/diff-no-index.c index e7041b89e38..3a8965672c5 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -8,13 +8,10 @@ #include "abspath.h" #include "color.h" #include "commit.h" -#include "blob.h" -#include "tag.h" #include "diff.h" #include "diffcore.h" #include "gettext.h" #include "revision.h" -#include "log-tree.h" #include "parse-options.h" #include "string-list.h" #include "dir.h" diff --git a/diff.c b/diff.c index 2c602df10a3..587341805c2 100644 --- a/diff.c +++ b/diff.c @@ -16,12 +16,10 @@ #include "hex.h" #include "xdiff-interface.h" #include "color.h" -#include "attr.h" #include "run-command.h" #include "utf8.h" #include "object-store-ll.h" #include "userdiff.h" -#include "submodule-config.h" #include "submodule.h" #include "hashmap.h" #include "mem-pool.h" diff --git a/diffcore-break.c b/diffcore-break.c index f57ece2757d..49ba38aa7c0 100644 --- a/diffcore-break.c +++ b/diffcore-break.c @@ -2,7 +2,6 @@ * Copyright (C) 2005 Junio C Hamano */ #include "git-compat-util.h" -#include "diff.h" #include "diffcore.h" #include "hash.h" #include "object.h" diff --git a/diffcore-delta.c b/diffcore-delta.c index c30b56e983b..4927ab8fb0c 100644 --- a/diffcore-delta.c +++ b/diffcore-delta.c @@ -1,5 +1,4 @@ #include "git-compat-util.h" -#include "diff.h" #include "diffcore.h" /* diff --git a/dir.c b/dir.c index 16fdb03f2a5..3e75c126edf 100644 --- a/dir.c +++ b/dir.c @@ -16,7 +16,6 @@ #include "object-file.h" #include "object-store-ll.h" #include "path.h" -#include "attr.h" #include "refs.h" #include "wildmatch.h" #include "pathspec.h" diff --git a/entry.c b/entry.c index 076e97eb89c..f918a3a78e8 100644 --- a/entry.c +++ b/entry.c @@ -1,5 +1,4 @@ #include "git-compat-util.h" -#include "blob.h" #include "object-store-ll.h" #include "dir.h" #include "environment.h" diff --git a/exec-cmd.c b/exec-cmd.c index 1d597e84ea7..909777f61f4 100644 --- a/exec-cmd.c +++ b/exec-cmd.c @@ -4,7 +4,6 @@ #include "exec-cmd.h" #include "gettext.h" #include "path.h" -#include "quote.h" #include "run-command.h" #include "strvec.h" #include "trace.h" diff --git a/fetch-pack.c b/fetch-pack.c index 26999e3b659..b0373bd87c4 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -10,7 +10,6 @@ #include "pkt-line.h" #include "commit.h" #include "tag.h" -#include "exec-cmd.h" #include "pack.h" #include "sideband.h" #include "fetch-pack.h" @@ -18,7 +17,6 @@ #include "run-command.h" #include "connect.h" #include "trace2.h" -#include "transport.h" #include "version.h" #include "oid-array.h" #include "oidset.h" diff --git a/fsck.c b/fsck.c index 6a0bbc50877..9fce4c9628f 100644 --- a/fsck.c +++ b/fsck.c @@ -16,7 +16,6 @@ #include "refs.h" #include "url.h" #include "utf8.h" -#include "decorate.h" #include "oidset.h" #include "packfile.h" #include "submodule-config.h" diff --git a/gettext.c b/gettext.c index f27e94407b4..57facbc21ec 100644 --- a/gettext.c +++ b/gettext.c @@ -7,9 +7,7 @@ #include "environment.h" #include "exec-cmd.h" #include "gettext.h" -#include "strbuf.h" #include "utf8.h" -#include "config.h" #ifndef NO_GETTEXT # include diff --git a/gpg-interface.c b/gpg-interface.c index 48f43c5a21d..636475f598f 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -12,7 +12,6 @@ #include "sigchain.h" #include "tempfile.h" #include "alias.h" -#include "environment.h" static int git_gpg_config(const char *, const char *, const struct config_context *, void *); diff --git a/grep.c b/grep.c index fc2d0c837a3..5f23d1a50ca 100644 --- a/grep.c +++ b/grep.c @@ -9,7 +9,6 @@ #include "xdiff-interface.h" #include "diff.h" #include "diffcore.h" -#include "commit.h" #include "quote.h" #include "help.h" diff --git a/http-fetch.c b/http-fetch.c index fffda592670..93695a440ad 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -1,6 +1,5 @@ #include "git-compat-util.h" #include "config.h" -#include "exec-cmd.h" #include "gettext.h" #include "hex.h" #include "http.h" diff --git a/http-push.c b/http-push.c index a704f490fdb..329513270c8 100644 --- a/http-push.c +++ b/http-push.c @@ -6,10 +6,8 @@ #include "tag.h" #include "blob.h" #include "http.h" -#include "refs.h" #include "diff.h" #include "revision.h" -#include "exec-cmd.h" #include "remote.h" #include "list-objects.h" #include "setup.h" diff --git a/http-walker.c b/http-walker.c index 78d99f7c4b0..b395ef13279 100644 --- a/http-walker.c +++ b/http-walker.c @@ -1,6 +1,5 @@ #include "git-compat-util.h" #include "repository.h" -#include "commit.h" #include "hex.h" #include "walker.h" #include "http.h" diff --git a/http.c b/http.c index 8f71bf00d89..a64005ceb80 100644 --- a/http.c +++ b/http.c @@ -15,7 +15,6 @@ #include "trace.h" #include "transport.h" #include "packfile.h" -#include "protocol.h" #include "string-list.h" #include "object-file.h" #include "object-store-ll.h" diff --git a/imap-send.c b/imap-send.c index 996651e4f80..904cb23cf57 100644 --- a/imap-send.c +++ b/imap-send.c @@ -24,12 +24,10 @@ #include "git-compat-util.h" #include "config.h" #include "credential.h" -#include "exec-cmd.h" #include "gettext.h" #include "run-command.h" #include "parse-options.h" #include "setup.h" -#include "strbuf.h" #if defined(NO_OPENSSL) && !defined(HAVE_OPENSSL_CSPRNG) typedef void *SSL; #endif diff --git a/line-log.c b/line-log.c index 24a1ecb6779..a878cb7810a 100644 --- a/line-log.c +++ b/line-log.c @@ -2,7 +2,6 @@ #include "line-range.h" #include "hex.h" #include "tag.h" -#include "blob.h" #include "tree.h" #include "diff.h" #include "commit.h" @@ -12,7 +11,6 @@ #include "xdiff-interface.h" #include "strbuf.h" #include "log-tree.h" -#include "graph.h" #include "userdiff.h" #include "line-log.h" #include "setup.h" diff --git a/line-range.c b/line-range.c index 47bf0d6f1a2..60f0e5ada81 100644 --- a/line-range.c +++ b/line-range.c @@ -1,7 +1,6 @@ #include "git-compat-util.h" #include "line-range.h" #include "xdiff-interface.h" -#include "strbuf.h" #include "userdiff.h" /* diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c index 8a08b7af49c..c5f363ca6f7 100644 --- a/list-objects-filter-options.c +++ b/list-objects-filter-options.c @@ -1,11 +1,6 @@ #include "git-compat-util.h" -#include "commit.h" #include "config.h" #include "gettext.h" -#include "revision.h" -#include "strvec.h" -#include "list-objects.h" -#include "list-objects-filter.h" #include "list-objects-filter-options.h" #include "promisor-remote.h" #include "trace.h" diff --git a/list-objects-filter.c b/list-objects-filter.c index 9327ccd5057..da287cc8e0d 100644 --- a/list-objects-filter.c +++ b/list-objects-filter.c @@ -2,14 +2,9 @@ #include "dir.h" #include "gettext.h" #include "hex.h" -#include "tag.h" #include "commit.h" -#include "tree.h" -#include "blob.h" #include "diff.h" -#include "tree-walk.h" #include "revision.h" -#include "list-objects.h" #include "list-objects-filter.h" #include "list-objects-filter-options.h" #include "oidmap.h" diff --git a/ls-refs.c b/ls-refs.c index 0e49b932c30..819cbefee3d 100644 --- a/ls-refs.c +++ b/ls-refs.c @@ -5,7 +5,6 @@ #include "hex.h" #include "repository.h" #include "refs.h" -#include "remote.h" #include "strvec.h" #include "ls-refs.h" #include "pkt-line.h" diff --git a/merge-blobs.c b/merge-blobs.c index 9293cbf75c8..2f659fd0143 100644 --- a/merge-blobs.c +++ b/merge-blobs.c @@ -1,6 +1,4 @@ #include "git-compat-util.h" -#include "run-command.h" -#include "xdiff-interface.h" #include "merge-ll.h" #include "blob.h" #include "merge-blobs.h" diff --git a/merge-ort.c b/merge-ort.c index 6491070d965..2a0be468505 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -19,7 +19,6 @@ #include "alloc.h" #include "attr.h" -#include "blob.h" #include "cache-tree.h" #include "commit.h" #include "commit-reach.h" @@ -42,7 +41,6 @@ #include "revision.h" #include "sparse-index.h" #include "strmap.h" -#include "submodule-config.h" #include "submodule.h" #include "trace2.h" #include "tree.h" diff --git a/merge-recursive.c b/merge-recursive.c index e3beb0801b1..a0c3e7a2d91 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -6,10 +6,7 @@ #include "git-compat-util.h" #include "merge-recursive.h" -#include "advice.h" #include "alloc.h" -#include "attr.h" -#include "blob.h" #include "cache-tree.h" #include "commit.h" #include "commit-reach.h" @@ -32,8 +29,6 @@ #include "revision.h" #include "sparse-index.h" #include "string-list.h" -#include "submodule-config.h" -#include "submodule.h" #include "symlinks.h" #include "tag.h" #include "tree-walk.h" diff --git a/merge.c b/merge.c index b60925459c2..ca89b312d17 100644 --- a/merge.c +++ b/merge.c @@ -1,6 +1,4 @@ #include "git-compat-util.h" -#include "diff.h" -#include "diffcore.h" #include "gettext.h" #include "hash.h" #include "hex.h" @@ -13,7 +11,6 @@ #include "tree.h" #include "tree-walk.h" #include "unpack-trees.h" -#include "dir.h" static const char *merge_argument(struct commit *commit) { diff --git a/negotiator/noop.c b/negotiator/noop.c index de39028ab7f..65e3c200084 100644 --- a/negotiator/noop.c +++ b/negotiator/noop.c @@ -1,6 +1,5 @@ #include "git-compat-util.h" #include "noop.h" -#include "../commit.h" #include "../fetch-negotiator.h" static void known_common(struct fetch_negotiator *n UNUSED, diff --git a/notes.c b/notes.c index 1ef2a331ce9..fed1eda80cd 100644 --- a/notes.c +++ b/notes.c @@ -5,8 +5,6 @@ #include "notes.h" #include "object-name.h" #include "object-store-ll.h" -#include "blob.h" -#include "tree.h" #include "utf8.h" #include "strbuf.h" #include "tree-walk.h" diff --git a/object-file.c b/object-file.c index 7c7afe57936..619f039ebc7 100644 --- a/object-file.c +++ b/object-file.c @@ -15,24 +15,16 @@ #include "hex.h" #include "string-list.h" #include "lockfile.h" -#include "delta.h" #include "pack.h" -#include "blob.h" #include "commit.h" #include "run-command.h" -#include "tag.h" -#include "tree.h" -#include "tree-walk.h" #include "refs.h" -#include "pack-revindex.h" -#include "hash-lookup.h" #include "bulk-checkin.h" #include "repository.h" #include "replace-object.h" #include "streaming.h" #include "dir.h" #include "list.h" -#include "mergesort.h" #include "quote.h" #include "packfile.h" #include "object-file.h" diff --git a/object-name.c b/object-name.c index 0bfa29dbbfe..3a2ef5d6800 100644 --- a/object-name.c +++ b/object-name.c @@ -8,7 +8,6 @@ #include "tag.h" #include "commit.h" #include "tree.h" -#include "blob.h" #include "tree-walk.h" #include "refs.h" #include "remote.h" @@ -21,7 +20,6 @@ #include "read-cache-ll.h" #include "repository.h" #include "setup.h" -#include "submodule.h" #include "midx.h" #include "commit-reach.h" #include "date.h" diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c index f4ecdf8b0e3..be4733e3bdc 100644 --- a/pack-bitmap-write.c +++ b/pack-bitmap-write.c @@ -4,12 +4,9 @@ #include "hex.h" #include "object-store-ll.h" #include "commit.h" -#include "tag.h" #include "diff.h" #include "revision.h" -#include "list-objects.h" #include "progress.h" -#include "pack-revindex.h" #include "pack.h" #include "pack-bitmap.h" #include "hash-lookup.h" diff --git a/pack-check.c b/pack-check.c index 977f619618e..25104d5b14c 100644 --- a/pack-check.c +++ b/pack-check.c @@ -3,7 +3,6 @@ #include "hex.h" #include "repository.h" #include "pack.h" -#include "pack-revindex.h" #include "progress.h" #include "packfile.h" #include "object-file.h" diff --git a/pack-write.c b/pack-write.c index b19ddf15b28..80ecfa544c5 100644 --- a/pack-write.c +++ b/pack-write.c @@ -7,7 +7,6 @@ #include "remote.h" #include "chunk-format.h" #include "pack-mtimes.h" -#include "oidmap.h" #include "pack-objects.h" #include "pack-revindex.h" #include "path.h" diff --git a/packfile.c b/packfile.c index 9cc0a2e37a8..84a005674d8 100644 --- a/packfile.c +++ b/packfile.c @@ -9,7 +9,6 @@ #include "mergesort.h" #include "packfile.h" #include "delta.h" -#include "streaming.h" #include "hash-lookup.h" #include "commit.h" #include "object.h" diff --git a/parse-options.c b/parse-options.c index e0c94b0546b..6054a3ca5ae 100644 --- a/parse-options.c +++ b/parse-options.c @@ -2,8 +2,6 @@ #include "parse-options.h" #include "abspath.h" #include "parse.h" -#include "commit.h" -#include "color.h" #include "gettext.h" #include "strbuf.h" #include "string-list.h" diff --git a/patch-ids.c b/patch-ids.c index c3e1a0dd216..a5683b462c6 100644 --- a/patch-ids.c +++ b/patch-ids.c @@ -2,7 +2,6 @@ #include "diff.h" #include "commit.h" #include "hash.h" -#include "hash-lookup.h" #include "hex.h" #include "patch-ids.h" diff --git a/protocol-caps.c b/protocol-caps.c index 808a68c974a..75f4cbb0a70 100644 --- a/protocol-caps.c +++ b/protocol-caps.c @@ -3,7 +3,6 @@ #include "gettext.h" #include "hex.h" #include "pkt-line.h" -#include "strvec.h" #include "hash-ll.h" #include "hex.h" #include "object.h" diff --git a/reachable.c b/reachable.c index 0ce8f83e56a..f29b06a5d05 100644 --- a/reachable.c +++ b/reachable.c @@ -2,7 +2,6 @@ #include "gettext.h" #include "hex.h" #include "refs.h" -#include "tag.h" #include "commit.h" #include "blob.h" #include "diff.h" diff --git a/read-cache.c b/read-cache.c index 080bd39713b..08970caff7c 100644 --- a/read-cache.c +++ b/read-cache.c @@ -20,7 +20,6 @@ #include "oid-array.h" #include "tree.h" #include "commit.h" -#include "blob.h" #include "environment.h" #include "gettext.h" #include "mem-pool.h" @@ -31,7 +30,6 @@ #include "read-cache.h" #include "resolve-undo.h" #include "revision.h" -#include "run-command.h" #include "strbuf.h" #include "trace2.h" #include "varint.h" diff --git a/ref-filter.c b/ref-filter.c index e4d3510e28e..96959a3762c 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -22,12 +22,10 @@ #include "ref-filter.h" #include "revision.h" #include "utf8.h" -#include "version.h" #include "versioncmp.h" #include "trailer.h" #include "wt-status.h" #include "commit-slab.h" -#include "commit-graph.h" #include "commit-reach.h" #include "worktree.h" #include "hashmap.h" diff --git a/reflog.c b/reflog.c index 9ad50e7d93e..0a1bc35e8cd 100644 --- a/reflog.c +++ b/reflog.c @@ -6,7 +6,6 @@ #include "revision.h" #include "tree.h" #include "tree-walk.h" -#include "worktree.h" /* Remember to update object flag allocation in object.h */ #define INCOMPLETE (1u<<10) diff --git a/refs/files-backend.c b/refs/files-backend.c index db5c0c7a724..922e65e0d9c 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -1,5 +1,4 @@ #include "../git-compat-util.h" -#include "../config.h" #include "../copy.h" #include "../environment.h" #include "../gettext.h" @@ -19,7 +18,6 @@ #include "../dir.h" #include "../chdir-notify.h" #include "../setup.h" -#include "../worktree.h" #include "../wrapper.h" #include "../write-or-die.h" #include "../revision.h" diff --git a/refs/packed-backend.c b/refs/packed-backend.c index 59c78d7941f..5963e67c14c 100644 --- a/refs/packed-backend.c +++ b/refs/packed-backend.c @@ -1,5 +1,4 @@ #include "../git-compat-util.h" -#include "../alloc.h" #include "../config.h" #include "../gettext.h" #include "../hash.h" diff --git a/refs/ref-cache.c b/refs/ref-cache.c index 6e3b725245c..a372a00941f 100644 --- a/refs/ref-cache.c +++ b/refs/ref-cache.c @@ -1,5 +1,4 @@ #include "../git-compat-util.h" -#include "../alloc.h" #include "../hash.h" #include "../refs.h" #include "../repository.h" diff --git a/reftable/dump.c b/reftable/dump.c index ce936b4e188..26e0393c7db 100644 --- a/reftable/dump.c +++ b/reftable/dump.c @@ -11,14 +11,12 @@ https://developers.google.com/open-source/licenses/bsd #include "reftable-blocksource.h" #include "reftable-error.h" -#include "reftable-merged.h" #include "reftable-record.h" #include "reftable-tests.h" #include "reftable-writer.h" #include "reftable-iterator.h" #include "reftable-reader.h" #include "reftable-stack.h" -#include "reftable-generic.h" #include #include diff --git a/reftable/generic.c b/reftable/generic.c index 57f8032db94..b9f1c7c18a2 100644 --- a/reftable/generic.c +++ b/reftable/generic.c @@ -6,7 +6,6 @@ license that can be found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd */ -#include "basics.h" #include "constants.h" #include "record.h" #include "generic.h" diff --git a/reftable/merged.c b/reftable/merged.c index 5ded470c086..9191f3addd1 100644 --- a/reftable/merged.c +++ b/reftable/merged.c @@ -11,7 +11,6 @@ https://developers.google.com/open-source/licenses/bsd #include "constants.h" #include "iter.h" #include "pq.h" -#include "reader.h" #include "record.h" #include "generic.h" #include "reftable-merged.h" diff --git a/reftable/merged_test.c b/reftable/merged_test.c index d08c16abefb..0d6e0d4bf57 100644 --- a/reftable/merged_test.c +++ b/reftable/merged_test.c @@ -12,7 +12,6 @@ https://developers.google.com/open-source/licenses/bsd #include "basics.h" #include "blocksource.h" -#include "constants.h" #include "reader.h" #include "record.h" #include "test_framework.h" diff --git a/reftable/reader.c b/reftable/reader.c index b4db23ce188..8b7a27781c3 100644 --- a/reftable/reader.c +++ b/reftable/reader.c @@ -16,7 +16,6 @@ https://developers.google.com/open-source/licenses/bsd #include "record.h" #include "reftable-error.h" #include "reftable-generic.h" -#include "tree.h" uint64_t block_source_size(struct reftable_block_source *source) { diff --git a/reftable/readwrite_test.c b/reftable/readwrite_test.c index 469ab79a5ad..f0d468be394 100644 --- a/reftable/readwrite_test.c +++ b/reftable/readwrite_test.c @@ -11,7 +11,6 @@ https://developers.google.com/open-source/licenses/bsd #include "basics.h" #include "block.h" #include "blocksource.h" -#include "constants.h" #include "reader.h" #include "record.h" #include "test_framework.h" diff --git a/reftable/refname_test.c b/reftable/refname_test.c index 8645cd93bbd..699e1aea412 100644 --- a/reftable/refname_test.c +++ b/reftable/refname_test.c @@ -9,7 +9,6 @@ https://developers.google.com/open-source/licenses/bsd #include "basics.h" #include "block.h" #include "blocksource.h" -#include "constants.h" #include "reader.h" #include "record.h" #include "refname.h" diff --git a/reftable/stack_test.c b/reftable/stack_test.c index d0b717510fa..d1b2908fa36 100644 --- a/reftable/stack_test.c +++ b/reftable/stack_test.c @@ -13,7 +13,6 @@ https://developers.google.com/open-source/licenses/bsd #include "reftable-reader.h" #include "merged.h" #include "basics.h" -#include "constants.h" #include "record.h" #include "test_framework.h" #include "reftable-tests.h" diff --git a/reftable/test_framework.c b/reftable/test_framework.c index 84ac972cad0..04044fc1a0f 100644 --- a/reftable/test_framework.c +++ b/reftable/test_framework.c @@ -9,7 +9,6 @@ https://developers.google.com/open-source/licenses/bsd #include "system.h" #include "test_framework.h" -#include "basics.h" void set_test_hash(uint8_t *p, int i) { diff --git a/reftable/tree_test.c b/reftable/tree_test.c index ac3a045ad4a..6961a657adb 100644 --- a/reftable/tree_test.c +++ b/reftable/tree_test.c @@ -9,8 +9,6 @@ https://developers.google.com/open-source/licenses/bsd #include "system.h" #include "tree.h" -#include "basics.h" -#include "record.h" #include "test_framework.h" #include "reftable-tests.h" diff --git a/remote-curl.c b/remote-curl.c index ef05752ca57..204feebabe4 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -8,7 +8,6 @@ #include "strbuf.h" #include "walker.h" #include "http.h" -#include "exec-cmd.h" #include "run-command.h" #include "pkt-line.h" #include "string-list.h" diff --git a/remote.c b/remote.c index abb24822beb..6bef95316af 100644 --- a/remote.c +++ b/remote.c @@ -15,7 +15,6 @@ #include "diff.h" #include "revision.h" #include "dir.h" -#include "tag.h" #include "setup.h" #include "string-list.h" #include "strvec.h" diff --git a/rerere.c b/rerere.c index 09e19412859..ca7e77ba68c 100644 --- a/rerere.c +++ b/rerere.c @@ -12,12 +12,10 @@ #include "dir.h" #include "resolve-undo.h" #include "merge-ll.h" -#include "attr.h" #include "path.h" #include "pathspec.h" #include "object-file.h" #include "object-store-ll.h" -#include "hash-lookup.h" #include "strmap.h" #define RESOLVED 0 diff --git a/reset.c b/reset.c index 48da0adf851..0f2ff0fe315 100644 --- a/reset.c +++ b/reset.c @@ -6,7 +6,6 @@ #include "object-name.h" #include "refs.h" #include "reset.h" -#include "run-command.h" #include "tree-walk.h" #include "tree.h" #include "unpack-trees.h" diff --git a/revision.c b/revision.c index 00d5c29bfce..51c056adbe1 100644 --- a/revision.c +++ b/revision.c @@ -21,12 +21,10 @@ #include "reflog-walk.h" #include "patch-ids.h" #include "decorate.h" -#include "log-tree.h" #include "string-list.h" #include "line-log.h" #include "mailmap.h" #include "commit-slab.h" -#include "dir.h" #include "cache-tree.h" #include "bisect.h" #include "packfile.h" diff --git a/run-command.c b/run-command.c index a558042c876..0e7435718a5 100644 --- a/run-command.c +++ b/run-command.c @@ -14,9 +14,7 @@ #include "quote.h" #include "config.h" #include "packfile.h" -#include "hook.h" #include "compat/nonblock.h" -#include "alloc.h" void child_process_init(struct child_process *child) { diff --git a/send-pack.c b/send-pack.c index 89aca9d829e..37f59d4f66b 100644 --- a/send-pack.c +++ b/send-pack.c @@ -4,7 +4,6 @@ #include "date.h" #include "gettext.h" #include "hex.h" -#include "refs.h" #include "object-store-ll.h" #include "pkt-line.h" #include "sideband.h" @@ -12,7 +11,6 @@ #include "remote.h" #include "connect.h" #include "send-pack.h" -#include "quote.h" #include "transport.h" #include "version.h" #include "oid-array.h" diff --git a/sequencer.c b/sequencer.c index d584cac8ed9..fab88e4efcb 100644 --- a/sequencer.c +++ b/sequencer.c @@ -15,10 +15,8 @@ #include "pager.h" #include "commit.h" #include "sequencer.h" -#include "tag.h" #include "run-command.h" #include "hook.h" -#include "exec-cmd.h" #include "utf8.h" #include "cache-tree.h" #include "diff.h" @@ -39,7 +37,6 @@ #include "notes-utils.h" #include "sigchain.h" #include "unpack-trees.h" -#include "worktree.h" #include "oidmap.h" #include "oidset.h" #include "commit-slab.h" diff --git a/setup.c b/setup.c index fc592dc6dd5..c5d3efe1964 100644 --- a/setup.c +++ b/setup.c @@ -13,7 +13,6 @@ #include "string-list.h" #include "chdir-notify.h" #include "path.h" -#include "promisor-remote.h" #include "quote.h" #include "trace2.h" #include "worktree.h" diff --git a/shallow.c b/shallow.c index ac728cdd778..7711798127e 100644 --- a/shallow.c +++ b/shallow.c @@ -7,7 +7,6 @@ #include "commit.h" #include "tag.h" #include "pkt-line.h" -#include "remote.h" #include "refs.h" #include "oid-array.h" #include "path.h" diff --git a/shell.c b/shell.c index 5c67e7bd97e..2ece8b16e2e 100644 --- a/shell.c +++ b/shell.c @@ -4,7 +4,6 @@ #include "strbuf.h" #include "run-command.h" #include "alias.h" -#include "prompt.h" #define COMMAND_DIR "git-shell-commands" #define HELP_COMMAND COMMAND_DIR "/help" diff --git a/submodule.c b/submodule.c index e603a19a876..213da79f661 100644 --- a/submodule.c +++ b/submodule.c @@ -17,10 +17,8 @@ #include "string-list.h" #include "oid-array.h" #include "strvec.h" -#include "blob.h" #include "thread-utils.h" #include "path.h" -#include "quote.h" #include "remote.h" #include "worktree.h" #include "parse-options.h" @@ -30,7 +28,6 @@ #include "commit-reach.h" #include "read-cache-ll.h" #include "setup.h" -#include "shallow.h" #include "trace2.h" static int config_update_recurse_submodules = RECURSE_SUBMODULES_OFF; diff --git a/t/helper/test-bundle-uri.c b/t/helper/test-bundle-uri.c index 475058592d1..09dc78733c0 100644 --- a/t/helper/test-bundle-uri.c +++ b/t/helper/test-bundle-uri.c @@ -5,9 +5,7 @@ #include "strbuf.h" #include "string-list.h" #include "transport.h" -#include "ref-filter.h" #include "remote.h" -#include "refs.h" enum input_mode { KEY_VALUE_PAIRS, diff --git a/t/helper/test-fast-rebase.c b/t/helper/test-fast-rebase.c index cac20a72b3f..f9472c99143 100644 --- a/t/helper/test-fast-rebase.c +++ b/t/helper/test-fast-rebase.c @@ -24,7 +24,6 @@ #include "read-cache-ll.h" #include "refs.h" #include "revision.h" -#include "sequencer.h" #include "setup.h" #include "strvec.h" #include "tree.h" diff --git a/t/helper/test-reach.c b/t/helper/test-reach.c index 3e173399a00..1e159a754db 100644 --- a/t/helper/test-reach.c +++ b/t/helper/test-reach.c @@ -1,11 +1,9 @@ #include "test-tool.h" #include "commit.h" #include "commit-reach.h" -#include "config.h" #include "gettext.h" #include "hex.h" #include "object-name.h" -#include "parse-options.h" #include "ref-filter.h" #include "setup.h" #include "string-list.h" diff --git a/t/helper/test-repository.c b/t/helper/test-repository.c index 4cd8a952e5c..c925655c648 100644 --- a/t/helper/test-repository.c +++ b/t/helper/test-repository.c @@ -1,7 +1,6 @@ #include "test-tool.h" #include "commit-graph.h" #include "commit.h" -#include "config.h" #include "environment.h" #include "hex.h" #include "object-store-ll.h" diff --git a/t/helper/test-simple-ipc.c b/t/helper/test-simple-ipc.c index 941ae7e3bcf..fb5927775da 100644 --- a/t/helper/test-simple-ipc.c +++ b/t/helper/test-simple-ipc.c @@ -4,7 +4,6 @@ #include "test-tool.h" #include "gettext.h" -#include "strbuf.h" #include "simple-ipc.h" #include "parse-options.h" #include "thread-utils.h" diff --git a/t/helper/test-trace2.c b/t/helper/test-trace2.c index d5ca0046c89..a0032ee3964 100644 --- a/t/helper/test-trace2.c +++ b/t/helper/test-trace2.c @@ -2,7 +2,6 @@ #include "strvec.h" #include "run-command.h" #include "exec-cmd.h" -#include "config.h" #include "repository.h" #include "trace2.h" diff --git a/tmp-objdir.c b/tmp-objdir.c index 5f9074ad1c0..3509258be53 100644 --- a/tmp-objdir.c +++ b/tmp-objdir.c @@ -6,7 +6,6 @@ #include "environment.h" #include "object-file.h" #include "path.h" -#include "sigchain.h" #include "string-list.h" #include "strbuf.h" #include "strvec.h" diff --git a/trace2.c b/trace2.c index 6dc74dff4c7..d4220af9ae1 100644 --- a/trace2.c +++ b/trace2.c @@ -1,12 +1,8 @@ #include "git-compat-util.h" -#include "config.h" -#include "json-writer.h" -#include "quote.h" #include "repository.h" #include "run-command.h" #include "sigchain.h" #include "thread-utils.h" -#include "version.h" #include "trace.h" #include "trace2.h" #include "trace2/tr2_cfg.h" diff --git a/transport-helper.c b/transport-helper.c index 49811ef176d..e34a8f47cfb 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -3,13 +3,11 @@ #include "quote.h" #include "run-command.h" #include "commit.h" -#include "diff.h" #include "environment.h" #include "gettext.h" #include "hex.h" #include "object-name.h" #include "repository.h" -#include "revision.h" #include "remote.h" #include "string-list.h" #include "thread-utils.h" diff --git a/transport.c b/transport.c index 219af8fd50e..bd7899e9bf5 100644 --- a/transport.c +++ b/transport.c @@ -10,9 +10,7 @@ #include "remote.h" #include "connect.h" #include "send-pack.h" -#include "walker.h" #include "bundle.h" -#include "dir.h" #include "gettext.h" #include "refs.h" #include "refspec.h" @@ -26,7 +24,6 @@ #include "transport-internal.h" #include "protocol.h" #include "object-name.h" -#include "object-store-ll.h" #include "color.h" #include "bundle-uri.h" diff --git a/tree.c b/tree.c index 990f9c9854e..508e5fd76fd 100644 --- a/tree.c +++ b/tree.c @@ -1,12 +1,9 @@ #include "git-compat-util.h" -#include "cache-tree.h" #include "hex.h" #include "tree.h" #include "object-name.h" #include "object-store-ll.h" -#include "blob.h" #include "commit.h" -#include "tag.h" #include "alloc.h" #include "tree-walk.h" #include "repository.h" diff --git a/upload-pack.c b/upload-pack.c index ea234ab6a45..2537affa907 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -9,13 +9,10 @@ #include "repository.h" #include "object-store-ll.h" #include "oid-array.h" -#include "tag.h" #include "object.h" #include "commit.h" #include "diff.h" #include "revision.h" -#include "list-objects.h" -#include "list-objects-filter.h" #include "list-objects-filter-options.h" #include "run-command.h" #include "connect.h" @@ -24,11 +21,8 @@ #include "string-list.h" #include "strvec.h" #include "trace2.h" -#include "prio-queue.h" #include "protocol.h" -#include "quote.h" #include "upload-pack.h" -#include "serve.h" #include "commit-graph.h" #include "commit-reach.h" #include "shallow.h" diff --git a/wrapper.c b/wrapper.c index 7da15a56da6..eeac3741cf1 100644 --- a/wrapper.c +++ b/wrapper.c @@ -5,7 +5,6 @@ #include "abspath.h" #include "parse.h" #include "gettext.h" -#include "repository.h" #include "strbuf.h" #include "trace2.h" diff --git a/xdiff-interface.c b/xdiff-interface.c index adcea109fa9..b39ffb1f718 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -6,8 +6,6 @@ #include "xdiff-interface.h" #include "xdiff/xtypes.h" #include "xdiff/xdiffi.h" -#include "xdiff/xemit.h" -#include "xdiff/xmacros.h" #include "xdiff/xutils.h" struct xdiff_emit_state { From patchwork Sun Dec 3 06:41:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 13477204 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LffRNO7q" Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A359F2 for ; Sat, 2 Dec 2023 22:41:29 -0800 (PST) Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3332f1512e8so1999802f8f.2 for ; Sat, 02 Dec 2023 22:41:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701585687; x=1702190487; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=N3TGCI/YCgWfYljSZYwF1mWsCWRqnsoG9BODzgV1+jA=; b=LffRNO7qPyP44cIxnKY5YxCI0ieuVQoJ0InISdM4bH0uyJPlVaO2N4yiC5T7Xzp86n o/1aNjygg6gnSE0PWbu4ocX9tUZ/AGOirhUgFAs4mD8U3Yq7Y4T7qW+s+NvfsdE+d95K MprK5yGhFASKav8eDnSoQozausiDMtHJJIWHmCXo+2RzF2XjF5xG+cWuyvKt5ijXkM1m IC+49nMV6r3wItvXPLwxTtGyHA3W9/UtmeB9sIlC7akFOGtVFjCW4SPCb9XUyMTemg6K BRvtLoKUOaCkLtHXSLP9jZg4cIx64fAsnCnb72dU+f9ZzjmUZypPSmIbBrqomWZF9ukN dNXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701585687; x=1702190487; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N3TGCI/YCgWfYljSZYwF1mWsCWRqnsoG9BODzgV1+jA=; b=JVvctg2yeJY7E1ATZhnJ3dSuP4ZILrXb295bZOspqb4AE0Np6cvFtqAVdlxJA6PJyA 7SQ/MTNyj4CzvzXSxgiSoJQaxLCM9uOrzhukoo6s9NztQHz+K1LuOTDHD/W58mPdyVD6 YZNW0yTylTc4y/u+YiqzUpSvOdZVRAQWny9R4oTEaFOizibfhiHbOO0g5lwsQlTMyUQE no7mri6IL2ViaUaP4CD60J4SlqjPvpaecO0h04DGJ3i3Gpz3gLHDKPXO81vtex0P9+FG Pm7hBbg0BZq0AzBUIoBVNjFjFlCxglOA326rAS/uY/saKDnGU72IDJ8b9kzcAeIyjkf6 OYZQ== X-Gm-Message-State: AOJu0Yy+FjDBeQZoQYciVuEUVs02CQSlc5J6GcS4N93k+lqk39vKmSjH PohfM4yz4exTnKQnEcWalY6oMv6ZUZg= X-Google-Smtp-Source: AGHT+IFVLdammyN+sTRPUDzQCkwJZl/llBQsAr1BuJbmUrZA5SoVWFjZ8ZHy2fowMhkYFqlPo7GcFQ== X-Received: by 2002:a5d:4908:0:b0:332:fe4c:2204 with SMTP id x8-20020a5d4908000000b00332fe4c2204mr2043226wrq.50.1701585687206; Sat, 02 Dec 2023 22:41:27 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id o14-20020a056000010e00b00333359b522dsm4130309wrx.77.2023.12.02.22.41.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Dec 2023 22:41:27 -0800 (PST) Message-ID: <43222a4dac44a4b1f740d6c9737cb6a5f9c4ac49.1701585683.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 03 Dec 2023 06:41:12 +0000 Subject: [PATCH 03/12] archive.h: remove unnecessary include Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Elijah Newren From: Elijah Newren From: Elijah Newren The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need. Signed-off-by: Elijah Newren --- archive-tar.c | 1 + archive-zip.c | 1 + archive.c | 1 + archive.h | 1 - 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/archive-tar.c b/archive-tar.c index 07269968399..f2a0ed77523 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -9,6 +9,7 @@ #include "tar.h" #include "archive.h" #include "object-store-ll.h" +#include "strbuf.h" #include "streaming.h" #include "run-command.h" #include "write-or-die.h" diff --git a/archive-zip.c b/archive-zip.c index 7229e3e454f..fd1d3f816d3 100644 --- a/archive-zip.c +++ b/archive-zip.c @@ -10,6 +10,7 @@ #include "streaming.h" #include "utf8.h" #include "object-store-ll.h" +#include "strbuf.h" #include "userdiff.h" #include "write-or-die.h" #include "xdiff-interface.h" diff --git a/archive.c b/archive.c index 4562a69a0cc..50fd35bd27b 100644 --- a/archive.c +++ b/archive.c @@ -5,6 +5,7 @@ #include "environment.h" #include "gettext.h" #include "hex.h" +#include "object-name.h" #include "path.h" #include "pretty.h" #include "setup.h" diff --git a/archive.h b/archive.h index 3a4bdfbd078..bbe65ba0f90 100644 --- a/archive.h +++ b/archive.h @@ -1,7 +1,6 @@ #ifndef ARCHIVE_H #define ARCHIVE_H -#include "object-name.h" #include "pathspec.h" #include "string-list.h" From patchwork Sun Dec 3 06:41:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 13477205 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b8moxfwh" Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4FE0F3 for ; Sat, 2 Dec 2023 22:41:29 -0800 (PST) Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3316d09c645so3297146f8f.0 for ; Sat, 02 Dec 2023 22:41:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701585687; x=1702190487; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=eKpv5ZFzjn3B1VgPJnotlQlSa+AAZOHqDH7ko024YjQ=; b=b8moxfwhTZ7w90KCnY1v4ABWpZHyNkUiIiAGTYfZjT+AUdERywoc3vInJ1IBSyEEft 4SQl0QPwNrHZm1rCV7jp13nn0nPiO1QvGAlNjsmv0d0Fn81a2mM+qMPbnXYr8LeejUnh KwkoTzan8T7r58oFW/cxwjxx5F/tr2lspZGw73/2u/6wtwKndyvS4ymj+T+qWM18m7hA bpMrdXpUZMC++rhO6HDRrlt2Xmutej3a0W01qUwjOYcwJBSqZGElCkUWBI1iwCRIKiJ+ n5TciSZg2oY8p4ZfEmrWNSHFDae6nhXve3CkDHIp8Efnro3XXyb87xQPXQfk/q+QUMm4 c2ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701585687; x=1702190487; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eKpv5ZFzjn3B1VgPJnotlQlSa+AAZOHqDH7ko024YjQ=; b=um0lf79q8H5fhDwkL1Jcu2V1qDsPnZhsGwvVHvmpx1PZIZnxvnO0/tU1QYPCGMj8ZK 7BJBl4F02VbbyH0MHNeugFzy6tqP1F8e4uCe31cjArgbboiSlu52TltO2isF7IAuJY5r DPL/9sWSBcEXcd+8oxFeq2vQPmaWSFoj1mVc8ZckhbyBxXcAu4EWUk1BiKjEK70MW3qr nm/LYIVbq9RxVc4Dq2byK81bKQdUF2lhBFmZEzHDw68O1ru9U28QqjlcQKwELkXTMHCk sccEg1sRgQdy6t3FpLZ3G1S3spiLiEY8FFrzWPd7TLiiJe0b6d5lWEvA0ftHczP48HGL n7dA== X-Gm-Message-State: AOJu0YxBrufjgQ/qpbGC6YWsK74SlSTSSZP5Rwe8FG01q4zl1fdk/KZu hY/1DSEEqJywiC+bppC8jiNXh97YTbk= X-Google-Smtp-Source: AGHT+IEj9S34jnkgUBr/WmiiHx3Y0zMxHqYhv1ipcNVHUn3NYR4W2uunMYOLwp16tfche8GORCbvnQ== X-Received: by 2002:a5d:550f:0:b0:333:434b:5fb7 with SMTP id b15-20020a5d550f000000b00333434b5fb7mr208764wrv.66.1701585687638; Sat, 02 Dec 2023 22:41:27 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id o13-20020a5d648d000000b00332e67d6564sm8451481wri.67.2023.12.02.22.41.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Dec 2023 22:41:27 -0800 (PST) Message-ID: In-Reply-To: References: Date: Sun, 03 Dec 2023 06:41:13 +0000 Subject: [PATCH 04/12] blame.h: remove unnecessary includes Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Elijah Newren From: Elijah Newren From: Elijah Newren The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need. Signed-off-by: Elijah Newren --- blame.c | 2 ++ blame.h | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/blame.c b/blame.c index 141756975bf..1a16d4eb6a5 100644 --- a/blame.c +++ b/blame.c @@ -3,6 +3,7 @@ #include "object-store-ll.h" #include "cache-tree.h" #include "mergesort.h" +#include "commit.h" #include "convert.h" #include "diff.h" #include "diffcore.h" @@ -10,6 +11,7 @@ #include "hex.h" #include "path.h" #include "read-cache.h" +#include "revision.h" #include "setup.h" #include "tag.h" #include "trace2.h" diff --git a/blame.h b/blame.h index 31ddc85f19e..5b4e47d44c6 100644 --- a/blame.h +++ b/blame.h @@ -1,12 +1,9 @@ #ifndef BLAME_H #define BLAME_H -#include "commit.h" #include "oidset.h" #include "xdiff-interface.h" -#include "revision.h" #include "prio-queue.h" -#include "diff.h" #define PICKAXE_BLAME_MOVE 01 #define PICKAXE_BLAME_COPY 02 From patchwork Sun Dec 3 06:41:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 13477206 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DdAtyFTe" Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3DD4F4 for ; Sat, 2 Dec 2023 22:41:30 -0800 (PST) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3333224c7b9so1517406f8f.1 for ; Sat, 02 Dec 2023 22:41:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701585689; x=1702190489; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=wSCkfIpGZxL9WKaqL8EtN8rgM9Yovl63d21O0EWr+bw=; b=DdAtyFTeKFUh+KHi7AGIIoqEbL0QR7gkMMf4JKvuULqhGnEQLFSJgRbtojUFlNqToZ 7WWpR7M7D8nyxZdKTbcUftbdDbLGHt6czokSqdAT1KZtYj25MacKnGtiJgg8yua01vei 3bz74ZpPFJQMklN/lqUCMVMkGeA+08x9YPgBNmP5Vmm+dR5tzcx4rRhSuZ2V0w7d30ml qXDKpXIIlTDFHwDmGQMeYa8HINvmQbumcmY86aN7BK0HNddPUXlf4cGv1/ovl+wAoNoi Wkyfzy4plLFF3xts+tJDcJaaVd5OIDD1/+48lohARhiaF/oGtygjLr1KEQw27Nzxkaeg BoWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701585689; x=1702190489; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wSCkfIpGZxL9WKaqL8EtN8rgM9Yovl63d21O0EWr+bw=; b=XLWJSK8ONpRr4+kGJcEac9a0KJg6CqgTfuJnN14s8koEkcK7xDSYYqARhauPuxIAXX ZO3RQCq/9UDxa+qKqedJ6TQ9nJWAwzUqESfMcSAYgJpnNWPOpLsnT2TsW/S8qeK6nhaE EXCCiX9/gvRVzeKkdRu/phLNgu4TYRSeeSUgEl5zE7slQnBan4N9LBw051BoFQ/q2npc HGduGpqvf959Rpowt3FdsUiQHvBmpVoEoXMmNv+rfYSRcm/EZMxs6rNVdpPSK4s9KH89 so66ReRhqXwzAMKtS4Uu88GsT4mcH8+LDEgcqBTR+OHYcAMjnZOf/0P3ddPCBn59LFfI 1/ag== X-Gm-Message-State: AOJu0Yw90ChpGWe4uax7pQqdfWMnt3Ou/+d5vZ53gj+l1H05/MrrQemM 0X0uaR+YUhdEdeUfnW0jxoUIR7O8sa4= X-Google-Smtp-Source: AGHT+IFPLttA+7rU7MduIBYL+AkPgKIe16VujzT0Rl2QRs07o2Mq/MHrFtpx2yqUdhxoKLMztD3oVw== X-Received: by 2002:a05:6000:1372:b0:332:fbd4:1f98 with SMTP id q18-20020a056000137200b00332fbd41f98mr2171339wrz.38.1701585688716; Sat, 02 Dec 2023 22:41:28 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id q11-20020a5d658b000000b003333298eb4bsm5498870wru.61.2023.12.02.22.41.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Dec 2023 22:41:27 -0800 (PST) Message-ID: In-Reply-To: References: Date: Sun, 03 Dec 2023 06:41:14 +0000 Subject: [PATCH 05/12] fsmonitor--daemon.h: remove unnecessary includes Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Elijah Newren From: Elijah Newren From: Elijah Newren The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need. Signed-off-by: Elijah Newren --- builtin/fsmonitor--daemon.c | 2 ++ compat/fsmonitor/fsm-health-win32.c | 1 + compat/fsmonitor/fsm-listen-darwin.c | 1 + compat/fsmonitor/fsm-listen-win32.c | 1 + fsmonitor--daemon.h | 4 +--- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c index 5d01db5c029..7260604534f 100644 --- a/builtin/fsmonitor--daemon.c +++ b/builtin/fsmonitor--daemon.c @@ -1,6 +1,7 @@ #include "builtin.h" #include "abspath.h" #include "config.h" +#include "dir.h" #include "environment.h" #include "gettext.h" #include "parse-options.h" @@ -14,6 +15,7 @@ #include "simple-ipc.h" #include "khash.h" #include "pkt-line.h" +#include "run-command.h" #include "trace.h" #include "trace2.h" diff --git a/compat/fsmonitor/fsm-health-win32.c b/compat/fsmonitor/fsm-health-win32.c index 2d4e245beb1..2aa8c219ace 100644 --- a/compat/fsmonitor/fsm-health-win32.c +++ b/compat/fsmonitor/fsm-health-win32.c @@ -4,6 +4,7 @@ #include "fsm-health.h" #include "fsmonitor--daemon.h" #include "gettext.h" +#include "simple-ipc.h" /* * Every minute wake up and test our health. diff --git a/compat/fsmonitor/fsm-listen-darwin.c b/compat/fsmonitor/fsm-listen-darwin.c index 11b56d3ef12..2fc67442eb5 100644 --- a/compat/fsmonitor/fsm-listen-darwin.c +++ b/compat/fsmonitor/fsm-listen-darwin.c @@ -29,6 +29,7 @@ #include "fsmonitor--daemon.h" #include "fsmonitor-path-utils.h" #include "gettext.h" +#include "simple-ipc.h" #include "string-list.h" #include "trace.h" diff --git a/compat/fsmonitor/fsm-listen-win32.c b/compat/fsmonitor/fsm-listen-win32.c index 90a24122844..5a21dade7b8 100644 --- a/compat/fsmonitor/fsm-listen-win32.c +++ b/compat/fsmonitor/fsm-listen-win32.c @@ -4,6 +4,7 @@ #include "fsm-listen.h" #include "fsmonitor--daemon.h" #include "gettext.h" +#include "simple-ipc.h" #include "trace2.h" /* diff --git a/fsmonitor--daemon.h b/fsmonitor--daemon.h index 673f80d2aad..5cbbec8d940 100644 --- a/fsmonitor--daemon.h +++ b/fsmonitor--daemon.h @@ -3,9 +3,7 @@ #ifdef HAVE_FSMONITOR_DAEMON_BACKEND -#include "dir.h" -#include "run-command.h" -#include "simple-ipc.h" +#include "hashmap.h" #include "thread-utils.h" #include "fsmonitor-path-utils.h" From patchwork Sun Dec 3 06:41:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 13477207 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gWgHkTrs" Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0ACB4E6 for ; Sat, 2 Dec 2023 22:41:32 -0800 (PST) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40b479ec4a3so33866865e9.2 for ; Sat, 02 Dec 2023 22:41:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701585690; x=1702190490; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=ttkeYFSt4eNhwg/B0nagXg282CBMg4rUewvl4yzbtls=; b=gWgHkTrsvq7Ae5OlmuC8pTXbEhfWhkU+788+1ll7MmRBdKcN5Cd4ZntBcp8KF6t5ki uHPVw1gsikN1SYm8VO+p8+pWvi1LgLSIbttSBGR2V4NBV2rs/3p/gaXHlSrKyvn2zQaP Pa4cxbyFx9FzLk/zOQLhCfphoE0Z6M4bDObOnm26S/11qu/begH1ufbjy9Bh13GlBQZW k5ui/nXneI4PfRPQSqyizjHYfLVjxnrLVGhhkaxAw9svEob2LRlF9pgqaJT8EUZ0tuAH rQa/bgdSyPIWenA5XdWNAzX391FBi7GuWBaITaHjsPYeUDZrQVcHHwcGt3G5/1qvGbl+ ZbLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701585690; x=1702190490; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ttkeYFSt4eNhwg/B0nagXg282CBMg4rUewvl4yzbtls=; b=KRoYeJGqVjhAfnmT6lvavPB+Lw5aDz5TtPgT+h417i78JdfX7h5NRyNbc34Zs4w8PE dnaDkBEmQ/Kz5bNWXszI06egFXsJL0CBJMjWVcQlAFXXLw4i4KKndF2459qIoUdPBmSS iTfd6g5tEbLP7x6cxNu4r6MI+baaUWrCV5/C6IHn9QeNkLK6w43ZD03jYtfIAoTN3RRf 76Pj5y4Ok/hJ/XKENYwLG1LyvhKA5xz7W9l/mfyzLQa0gEj5WU++v7tgDiv8fcJCKgje dOAdhgN6jWq2g5k6QK8mSmKJCyFFpOEvypsk9a0iZowNmPHfBn7Y4IUTlO/lX0i9sSIv DBsA== X-Gm-Message-State: AOJu0Yy2Ah5dgZdwIoW3Fp653PwwGYq8l3BNkZHYr9Qxoutic4kU8geh 7wuDFrMzRF9BCNXap0JWdg/N1G6sGJI= X-Google-Smtp-Source: AGHT+IHFlPG6Gqte7/UfudynU5PGhK/BnLPM/pUJiX6hWUC0OlCubD7ITqACmYQy+ijL2aulGqWBXQ== X-Received: by 2002:a05:600c:1914:b0:40b:5e1b:549f with SMTP id j20-20020a05600c191400b0040b5e1b549fmr1959175wmq.43.1701585689770; Sat, 02 Dec 2023 22:41:29 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id z3-20020a05600c0a0300b0040839fcb217sm10957989wmp.8.2023.12.02.22.41.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Dec 2023 22:41:29 -0800 (PST) Message-ID: <393c5ca3a1dc26fb56a0ef54c010930ba33d546c.1701585683.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 03 Dec 2023 06:41:15 +0000 Subject: [PATCH 06/12] http.h: remove unnecessary include Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Elijah Newren From: Elijah Newren From: Elijah Newren The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need. Signed-off-by: Elijah Newren --- http-fetch.c | 1 + http-push.c | 1 + http.h | 1 - remote-curl.c | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/http-fetch.c b/http-fetch.c index 93695a440ad..bec94988bbe 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -6,6 +6,7 @@ #include "walker.h" #include "setup.h" #include "strvec.h" +#include "url.h" #include "urlmatch.h" #include "trace2.h" diff --git a/http-push.c b/http-push.c index 329513270c8..b4d0b2a6aa3 100644 --- a/http-push.c +++ b/http-push.c @@ -15,6 +15,7 @@ #include "strvec.h" #include "tree.h" #include "tree-walk.h" +#include "url.h" #include "packfile.h" #include "object-store-ll.h" #include "commit-reach.h" diff --git a/http.h b/http.h index 3a409bccd4e..3af19a8bf53 100644 --- a/http.h +++ b/http.h @@ -10,7 +10,6 @@ struct packed_git; #include "strbuf.h" #include "remote.h" -#include "url.h" #define DEFAULT_MAX_REQUESTS 5 diff --git a/remote-curl.c b/remote-curl.c index 204feebabe4..55eefa70f97 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -21,6 +21,7 @@ #include "quote.h" #include "trace2.h" #include "transport.h" +#include "url.h" #include "write-or-die.h" static struct remote *remote; From patchwork Sun Dec 3 06:41:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 13477208 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VozquvV2" Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D863EB for ; Sat, 2 Dec 2023 22:41:33 -0800 (PST) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-40a4848c6e1so33605335e9.1 for ; Sat, 02 Dec 2023 22:41:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701585691; x=1702190491; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=iNi9JTg7O8mXiHhbMn/8YgHPkgzDveZ7qNVf8534OA0=; b=VozquvV22GDEGRtLz3xZijQz/FLWPbxsPh299Y6YYdN7jqaRlBeftkrKsWp9M+7VH5 NXRf+LfkF1MFzqe4WKaKz2iEGbu8QsbOkr0R3BfOXmv5kizo4nOQRjSjzvNl61uF5EBs KUDMSGbgxyY/1zIyAYGvDr5gB8pOaNy3fnCdy0uROFBCoIt+/PnuvPE80ZRPujOSKwvo D7v2whGlicPykln8b2HCatM54ekcwwFRn6sUH0sVz93vx3pKKp8KKvHDem/soTE8JkZ/ 6PiqwRx7weLMHCJh7+VHlbp6u7t1hDiwHNIJiunUr5H92y+qm9cPTY7+beBwMyK9JbXT IqzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701585691; x=1702190491; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iNi9JTg7O8mXiHhbMn/8YgHPkgzDveZ7qNVf8534OA0=; b=WvBJHXXnc0+UKBjRgKcDX6X44bwVzQyWrH9RBUODrr1VfxJyKFWTmqaaQfn1RnaaEd ZVLI+wPaU040LO4UNUqDcqh04Jmk2op4cueNg0/MJ5jLCCY2v27xVYc23wkmQrAwmnT3 P8JKGMazlxJ36SAG4qvDAZSc/YZ9eKRBGFh/h5pRhMCb+jrhr1Xef92qEkVtf+wYYUGy UDiuwVD4+J/oOs15NZtAxTB3aZ23lGLjyb0tphcsdqZvuM6tBBepMuL/sLkQs6or3yEw m4zDPT1DmrDlkFOY0pfnBq6r2wSuz/TAOPdU3D/fGk0nTIgm1oRkUzMX4A8T/uxzpsXC Cs2g== X-Gm-Message-State: AOJu0Yz5XHJSsRoL2Ww3xpEq8j+Pud11pHAYHu6u3nt35MvKqAy8vvhd SNLLM0HUoIDO18fj2gAtnGzaePLka8U= X-Google-Smtp-Source: AGHT+IG7w4Pd9+zx6NUEtmoUceDPb5ptpbg1KBwkRkZEL2v4wpkb7ZVgjHM8DMJs5v8skXhIfUmyzw== X-Received: by 2002:a05:600c:2195:b0:40c:909:58f4 with SMTP id e21-20020a05600c219500b0040c090958f4mr189518wme.235.1701585691060; Sat, 02 Dec 2023 22:41:31 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f18-20020a05600c155200b004094d4292aesm10802345wmg.18.2023.12.02.22.41.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Dec 2023 22:41:30 -0800 (PST) Message-ID: <5f8014882e07682787adb6ccd59829f1ab01bd84.1701585683.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 03 Dec 2023 06:41:16 +0000 Subject: [PATCH 07/12] line-log.h: remove unnecessary include Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Elijah Newren From: Elijah Newren From: Elijah Newren The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need. Signed-off-by: Elijah Newren --- line-log.c | 1 + line-log.h | 2 -- log-tree.c | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/line-log.c b/line-log.c index a878cb7810a..c276ccec549 100644 --- a/line-log.c +++ b/line-log.c @@ -1,4 +1,5 @@ #include "git-compat-util.h" +#include "diffcore.h" #include "line-range.h" #include "hex.h" #include "tag.h" diff --git a/line-log.h b/line-log.h index 4291da8d792..e9dadbc1a58 100644 --- a/line-log.h +++ b/line-log.h @@ -1,8 +1,6 @@ #ifndef LINE_LOG_H #define LINE_LOG_H -#include "diffcore.h" - struct rev_info; struct commit; struct string_list; diff --git a/log-tree.c b/log-tree.c index 504da6b519e..337b9334cdb 100644 --- a/log-tree.c +++ b/log-tree.c @@ -2,6 +2,7 @@ #include "commit-reach.h" #include "config.h" #include "diff.h" +#include "diffcore.h" #include "environment.h" #include "hex.h" #include "object-name.h" From patchwork Sun Dec 3 06:41:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 13477209 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MiEc8Ns0" Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4ACBF2 for ; Sat, 2 Dec 2023 22:41:33 -0800 (PST) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40b54261524so39329355e9.3 for ; Sat, 02 Dec 2023 22:41:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701585692; x=1702190492; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=xSzRHp5BbQ8RHnANLkfpKqCzWCpWXu9TeHXFY5OAtwo=; b=MiEc8Ns0N3vFyuLnZ+Wbl/N0Gce08fC13NJ3mDX9+z4VuKmRjfWW7Gg62vVWUL3DEU yHdTFb5XiYvg3H1ue2lH8AdHjgVRHMcBSFx0S2/L8LaEKt+VwlGv3Z3TVmF9CRbNItXr 5AIQZijLFpf3JcWkxBDdpp0JWOXmBSYDk7otatMGvEspF4QvCKx5TOtEePVVAi0LK2CO v6y4tuqnArrFwsC1eEufRHSey8j7QmSTwxhNoNoxcJRvs8shjfGaXyOG8SLkeE7aHQTF vAwcCgsRwI3jLnvKMCxA1+ae79Va6Dq1dlCcY8uDme79pLCd7Ui5/LmvCael1/stPFpC AU0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701585692; x=1702190492; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xSzRHp5BbQ8RHnANLkfpKqCzWCpWXu9TeHXFY5OAtwo=; b=TfQto+QpeA5e5SbCCu9p6Ajd362FYCgobGEFVtH7rrO01oTCX4W2gkXJvA5cZXyv1y 8WVVNioiVikP3ATSGcQK5l3S0CDlvsWk2r9nXvc2zWIAk/jvp8cU/avQBM4L/bkJ8ZMB e6N0JcPt2F0H7fHl2G7z6N0bCXnyzSLYhGmzxt8Gfo7GotcoYx66RDoy5yUeFNpj9s7a tNKYh8p8/9VGewK2slSEH6hiE/NvDM+FEcBDKn1D8EmHIiYmj1FgG/YPPu9khJTjTngP IYSoGp7hVnmaCGrGXmqhy+N8EQ1m3lEBjAz32S0TSJErsmZ73XU/jSTSf50OtvnrnASZ qgVQ== X-Gm-Message-State: AOJu0YyNYqRXFfxU6riAtkkJnxxgEnuGJ5CF7xBsZ31Mq+mnG9miwQhZ tySyIPrzcTLVmN0s6+CsL+BqeqBZ5NI= X-Google-Smtp-Source: AGHT+IG6YVDBCanmQaBiN4CLvVD4Wug2iYYfchYVhQTEw/y9NrWTXUue7hnacrcyDka/F5D0Cql1Bg== X-Received: by 2002:a1c:790c:0:b0:40b:5e21:dd48 with SMTP id l12-20020a1c790c000000b0040b5e21dd48mr220631wme.118.1701585692069; Sat, 02 Dec 2023 22:41:32 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v1-20020a5d6781000000b003333f9200d8sm2152539wru.84.2023.12.02.22.41.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Dec 2023 22:41:31 -0800 (PST) Message-ID: In-Reply-To: References: Date: Sun, 03 Dec 2023 06:41:17 +0000 Subject: [PATCH 08/12] pkt-line.h: remove unnecessary include Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Elijah Newren From: Elijah Newren From: Elijah Newren The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need. Signed-off-by: Elijah Newren --- pkt-line.c | 1 + pkt-line.h | 1 - t/helper/test-pkt-line.c | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkt-line.c b/pkt-line.c index af83a19f4df..236dd3a3ee1 100644 --- a/pkt-line.c +++ b/pkt-line.c @@ -4,6 +4,7 @@ #include "gettext.h" #include "hex.h" #include "run-command.h" +#include "sideband.h" #include "trace.h" #include "write-or-die.h" diff --git a/pkt-line.h b/pkt-line.h index 954eec87197..aedef56286f 100644 --- a/pkt-line.h +++ b/pkt-line.h @@ -2,7 +2,6 @@ #define PKTLINE_H #include "strbuf.h" -#include "sideband.h" /* * Write a packetized stream, where each line is preceded by diff --git a/t/helper/test-pkt-line.c b/t/helper/test-pkt-line.c index f4d134a1452..77e99c37df0 100644 --- a/t/helper/test-pkt-line.c +++ b/t/helper/test-pkt-line.c @@ -1,6 +1,7 @@ #include "git-compat-util.h" #include "test-tool.h" #include "pkt-line.h" +#include "sideband.h" #include "write-or-die.h" static void pack_line(const char *line) From patchwork Sun Dec 3 06:41:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 13477210 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jtrKTGHm" Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EA81F3 for ; Sat, 2 Dec 2023 22:41:34 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-40c032962c5so12940765e9.3 for ; Sat, 02 Dec 2023 22:41:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701585693; x=1702190493; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=wI1ud4HLkaVcpZYdQynYi6SrOVU+12fz4PaoZLJWSmg=; b=jtrKTGHmKAGh0dEBuhxXHaPOKgUiTbt8fw4CE16YOJyXVj+MnXHYrMVMvvq+f97N8X TrdcxllY7okEcZQZ29YfyZiK0M4mZJAQKr/eirVCP36pnHR+ZOq3JqfwG8bQdhCzgZ+G GMayI1g4JEFcHqiC0Zzku8mA2+X523+8k0OwN4PPKJyJX2uEENzdaAu49oceB1Swg2nn ZVlwZa66TLaF5Z9TQ6KML3fXL4MmuLIlcSfy9Zy6sqDJ1PdRPXse4E5WvAugyE+gdSM+ 2og22LM6383OZXOafwq5Urf3e9Syktcw02gov5A6VwDRXfGB8ebctzUugfQ3nKC6Vubx pw5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701585693; x=1702190493; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wI1ud4HLkaVcpZYdQynYi6SrOVU+12fz4PaoZLJWSmg=; b=U+AbHPAES/dV31LvKmZjBw8bzRmOWer48vn1CLAW/B1gpuEfNKpvTIJhGu4/i+Luxn EOQAMJ8HgXUe3s65oaIXMlJMVg41KhO32PA0HFsXX6EMEHqfs4wiP8Il/WXeit8euV1Z VUR4Uo+LC1Wt3iUDTsh/iD0PN29vRvVCVBocW5OAUSFtIaA2XLCvtG0zcz39QY3Zqzh2 1/c1O3dSioCxLaK/qofCcBF/nXARj6Tnfwqxv71aspRWvDWGcsv+2uK7c+LdKc7grWld Rb8+Fno6W1mYx+xZgskMDVfMgk+9nop4+KeB+w2iSoBcM8GKGJsEiMQ6EI2Rm34J9EGW K22Q== X-Gm-Message-State: AOJu0YzkN0Arjonls+6p2LHJ/zMtMkHFHFQIwdX7unnIZuYAl88ljZ5Z 8rPgpKRMcKOPZ4Phxp4H5OCBLmukFMY= X-Google-Smtp-Source: AGHT+IF1hg4pLPHpvWoPJrN4Io9SvC382AtQUE7ghCNUw6KRz9iL3iKLJ8kvbxxITmACx8Lj46hSAA== X-Received: by 2002:a05:600c:35d3:b0:405:3d41:5646 with SMTP id r19-20020a05600c35d300b004053d415646mr1086304wmq.2.1701585692678; Sat, 02 Dec 2023 22:41:32 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id w3-20020a05600c474300b0040b36050f1bsm10723143wmo.44.2023.12.02.22.41.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Dec 2023 22:41:32 -0800 (PST) Message-ID: <6d25811965cb55f7044e98ea020da2516664ad35.1701585683.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 03 Dec 2023 06:41:18 +0000 Subject: [PATCH 09/12] submodule-config.h: remove unnecessary include Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Elijah Newren From: Elijah Newren From: Elijah Newren The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need. Signed-off-by: Elijah Newren --- submodule-config.h | 1 - t/helper/test-submodule.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/submodule-config.h b/submodule-config.h index e8164cca3e4..958f320ac6c 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -3,7 +3,6 @@ #include "config.h" #include "submodule.h" -#include "strbuf.h" #include "tree-walk.h" /** diff --git a/t/helper/test-submodule.c b/t/helper/test-submodule.c index 356e0a26c5a..50c154d0370 100644 --- a/t/helper/test-submodule.c +++ b/t/helper/test-submodule.c @@ -4,6 +4,7 @@ #include "remote.h" #include "repository.h" #include "setup.h" +#include "strbuf.h" #include "submodule-config.h" #include "submodule.h" From patchwork Sun Dec 3 06:41:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 13477211 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XXaYizWH" Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C9CDE6 for ; Sat, 2 Dec 2023 22:41:35 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3316a4bc37dso3264403f8f.2 for ; Sat, 02 Dec 2023 22:41:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701585693; x=1702190493; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=oCWixEfH4TB7v+wqSA2k0k7641XZv4vbXlQI8FYdHFA=; b=XXaYizWHXjbSvX2vYHRxudHJEHTS61CLKElqF6W6bTjjWYYoHTC/60jp2v1a7z2kHW xentPHygjh0Kob/jn4GuM6aJcgR8RPd9pneW0H8K+TY4PQIAJyoXk5/Vy+sDlBQEit1r mnwW0/ekRnGnYeH6ki4uaMYkAuHQQHo/LJlnJ4hORBn+lygtVl8rxsLNSqVDk/vxQ/nf fBc85NM5DuCDA2bZ/T/Feh/xEj7Q4h7xXBjM+GobHtAkR4qMnzSv6sPB5aZPx7+ZHkA2 l6QPGsYWMJRw5H+ZBe/67lXlfj9rHWh/b0GyQXg/Adl2WHBipBe03ud6edpVO7S2s6yv FZJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701585693; x=1702190493; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oCWixEfH4TB7v+wqSA2k0k7641XZv4vbXlQI8FYdHFA=; b=JhQCjRCUASAMM2K0g7NMuwICqrr2FhJK8vNBfV6FYEpu3bWI4fgH84G5gbQg24KheW 2XCCOF/2i56kB8GSS8FfPms4gyq8S6Ft27SKNYujnjq0qqQv7KyMYhADynJAlNEVIid4 3BouAh2kX3ptOLol8qWEd72hwGhgPcE7LDAcKDW7rMQoKsqd+tMjlsblEufLxQVEqHkM Nvqn1c1fgAxCzgtJAlgOa736wzQFJRlX9e5o2bpZAb6mGkyx7B225SJIW2HtFqQwo/He BtLVe+J9Y5JDZThKUq7HEdya63eykY8ysHswCwQKYgqLPnT7YNuypsy7zPBL8OLhfUFk aWJA== X-Gm-Message-State: AOJu0Yzn1LV6ZBTGd4hz/cDeJi8SLY3KrsCQ9kRhEJ8pd7x10dOyUOuo 3Gi5Im9VUw8p0hkOdjawMriyYqy0sF4= X-Google-Smtp-Source: AGHT+IFVEwczJ/YS/RTD2HCu8S5ub6QUS34oBH15UsMt6zjFidZNP3VTOUM3b6/VgNyGy3tNeDK0pw== X-Received: by 2002:a05:600c:2048:b0:40b:5e21:cc4a with SMTP id p8-20020a05600c204800b0040b5e21cc4amr1390272wmg.117.1701585693341; Sat, 02 Dec 2023 22:41:33 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id h15-20020a05600c314f00b004083a105f27sm14210488wmo.26.2023.12.02.22.41.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Dec 2023 22:41:33 -0800 (PST) Message-ID: <72fd5e2941fd77c9da29d97fcfee248ed2afb06d.1701585683.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 03 Dec 2023 06:41:19 +0000 Subject: [PATCH 10/12] trace2/tr2_tls.h: remove unnecessary include Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Elijah Newren From: Elijah Newren From: Elijah Newren The unnecessary include in the header transitively pulled in some other headers actually needed by source files, though. Have those source files explicitly include the headers they need. Signed-off-by: Elijah Newren --- trace2/tr2_tgt_normal.c | 1 + trace2/tr2_tls.c | 1 + trace2/tr2_tls.h | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c index 38d5ebddf65..baef48aa698 100644 --- a/trace2/tr2_tgt_normal.c +++ b/trace2/tr2_tgt_normal.c @@ -2,6 +2,7 @@ #include "config.h" #include "repository.h" #include "run-command.h" +#include "strbuf.h" #include "quote.h" #include "version.h" #include "trace2/tr2_dst.h" diff --git a/trace2/tr2_tls.c b/trace2/tr2_tls.c index 601c9e5036f..4f75392952b 100644 --- a/trace2/tr2_tls.c +++ b/trace2/tr2_tls.c @@ -1,4 +1,5 @@ #include "git-compat-util.h" +#include "strbuf.h" #include "thread-utils.h" #include "trace.h" #include "trace2/tr2_tls.h" diff --git a/trace2/tr2_tls.h b/trace2/tr2_tls.h index f9049805d4d..3dfe6557fc4 100644 --- a/trace2/tr2_tls.h +++ b/trace2/tr2_tls.h @@ -1,7 +1,6 @@ #ifndef TR2_TLS_H #define TR2_TLS_H -#include "strbuf.h" #include "trace2/tr2_ctr.h" #include "trace2/tr2_tmr.h" From patchwork Sun Dec 3 06:41:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 13477212 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b4fZ5KA+" Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44F4AEB for ; Sat, 2 Dec 2023 22:41:36 -0800 (PST) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-33338c67d20so929528f8f.0 for ; Sat, 02 Dec 2023 22:41:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701585694; x=1702190494; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=eWLJcNfIQIUp4tzQE7++unCeOFOjKzm/JkqM5nU7tSY=; b=b4fZ5KA+pAKELaoNxJJwP9NJYRXYJP+vzz4EP9o1RABQ0mKXskJgZnAaF6/evv6/CI 67mnoJEtlUB5kruvj76nMEP3d0h4HasigBHhXTaLeTDu+weXy07mVn6GWsKypd+FW47T 7k22UMGU4Eg8G5n4UQaHGksSiM9wM/imnMyKVuvOUCTbDvRJKqDC8PQvDsldGjJhWEjq V7sg2lAWdu4uXslsrL/10HRJJ/4d+/zm65DGDmu0ZGtqVddFrGsu7cARys1dWnWmpfwC ljQEsfC2eGSYYnuRJPyHAVWKy0nnu2Yl6qoTARjnVTwCgkTujIYfDoEO21a883F/Y1pT rIOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701585694; x=1702190494; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eWLJcNfIQIUp4tzQE7++unCeOFOjKzm/JkqM5nU7tSY=; b=tu1swk2yHls21Tx4MxJ3Tq/a5vyGQOSwP1RBOqh9p4odfJELWHFxFgR280mA4ySde/ IBiR50NaeM3uMVfiublOXqRLmDtrFUMpYF+ZEKqNNM9AibDxi4zosnIdzHg5GwOgBbDZ vm2eKSbX4+G1dNqYSyiQUE0+OP93jUUm4uJRf2juY0eRPEdSvmjqrCw8r1bPGiU6vdEe PA3szTZIc+paRnWiRgFKThVjeJdd0u9P61rInRehFKA6raZ+OXzkRm/IQKa673DZcA7G Ih71ae/PsKQT74doynlCFWQV1fuyw1xY9BGCb1GixUC3fWloBL5/jjfeW0YcvQwO9npk O++g== X-Gm-Message-State: AOJu0Yx/G3D3bmmWd2pnWoFIYZA2GLh7FeXb4eash5h/ZPXUmlxjIsL3 6+XawAKgeOR99OnV7TZ5zNjniUN0LZA= X-Google-Smtp-Source: AGHT+IHuv+8UeQ4KFqJqgumUHhhA3q5tpDyLyZ51D/DIPiA+gFxMAvnXfE7KwrtmiXri8HJo4ENTwA== X-Received: by 2002:a05:600c:1381:b0:40b:5e21:e259 with SMTP id u1-20020a05600c138100b0040b5e21e259mr1431675wmf.70.1701585694031; Sat, 02 Dec 2023 22:41:34 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id l10-20020a05600c1d0a00b00407460234f9sm10773321wms.21.2023.12.02.22.41.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Dec 2023 22:41:33 -0800 (PST) Message-ID: In-Reply-To: References: Date: Sun, 03 Dec 2023 06:41:20 +0000 Subject: [PATCH 11/12] treewide: add direct includes currently only pulled in transitively Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Elijah Newren From: Elijah Newren From: Elijah Newren The next commit will remove a bunch of unnecessary includes, but to do so, we need some of the lower level direct includes that files rely on to be explicitly specified. Signed-off-by: Elijah Newren --- builtin/commit-graph.c | 1 + builtin/for-each-ref.c | 1 + builtin/fsmonitor--daemon.c | 1 + commit-graph.c | 1 + 4 files changed, 4 insertions(+) diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index c5684342ecf..81a28c6fcdd 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -11,6 +11,7 @@ #include "object-store-ll.h" #include "progress.h" #include "replace-object.h" +#include "strbuf.h" #include "tag.h" #include "trace2.h" diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index 6235d72f9d3..b5bc700d13c 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -1,4 +1,5 @@ #include "builtin.h" +#include "commit.h" #include "config.h" #include "gettext.h" #include "object.h" diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c index 7260604534f..9f80b9eaff5 100644 --- a/builtin/fsmonitor--daemon.c +++ b/builtin/fsmonitor--daemon.c @@ -12,6 +12,7 @@ #include "compat/fsmonitor/fsm-health.h" #include "compat/fsmonitor/fsm-listen.h" #include "fsmonitor--daemon.h" +#include "repository.h" #include "simple-ipc.h" #include "khash.h" #include "pkt-line.h" diff --git a/commit-graph.c b/commit-graph.c index 5bfee53e87b..e7212400da3 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1,5 +1,6 @@ #include "git-compat-util.h" #include "config.h" +#include "csum-file.h" #include "gettext.h" #include "hex.h" #include "lockfile.h" From patchwork Sun Dec 3 06:41:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elijah Newren X-Patchwork-Id: 13477213 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UEld73Rr" Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFE6FF9 for ; Sat, 2 Dec 2023 22:41:36 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-40c09d0b045so1335635e9.0 for ; Sat, 02 Dec 2023 22:41:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701585695; x=1702190495; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=Aqb9knrlfUb7YhUuQR1MxrWluSV1cN886PjCysScI4s=; b=UEld73RroVBpVIjdsGUG94Ehz5B4bjYcPVu8+1RKuWSooTb3g1wxC7zPxoJLkIJZGl HWKLEljiHdi8+zZKolm/xZE6fIbGGk8tUjYfAfEdMuIrx+0jZhFfTXkQXCENWkbdjxKJ wK/RrZ0eVDxXouUDpGXU6onuRerCSF+gIkqqnIOCL7lbYCj/I+aLqSk5emzg97ustp8v pcBZkoVkoFfxcj17OvA0SaarQlfckamJpXO3Fyp5XSZ9XvJNW/qu+QPyWhur1Ny58J+n 18CPygBwasvKeLGWN2hmzhur9T0PPXMD9r3YX5Ivr9Hd7zVBJlAaQNMFEkbtn2Jyx4JC 06fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701585695; x=1702190495; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Aqb9knrlfUb7YhUuQR1MxrWluSV1cN886PjCysScI4s=; b=WsO3Sid3TX2eZLshnlJ8ZXE90Qihxl/KBkF5X9KOd9BTQQ03dtOO5YRqdGh+9c/rBI v3Sgy1XHLRx0fZUoJVFE3Ce8KG6eTcRMzQfB4VaPAMLrv2Hd4zzk3vksQhW1YEOb4pz3 9M5hCOXnIhUweI+N8xmvuXjifFJY14VDJs4I0VdUH1VUSvIx5FuANkE2o5uqmmvBz8Jc VKgyqLZHN3aXl03201vSgMImlxeCpLchvOavKHKuwtKVPzibSN5f+CpQ6L6kjQ8iqX5s qnCUJ2eHUCn5/dTha7/g24ja1Hb8l5U1795zzxiHL+EEYx9w/RZsrQTA0dgEcq5Id/lU vXKw== X-Gm-Message-State: AOJu0Yw9k+6mde3NnKHKAoINodR8N+XCU0bzOa41ubAd2ITJKMa7WNiT SGXfR0trN4EsNBlYUSBOmaY8UVQZSbE= X-Google-Smtp-Source: AGHT+IGaVNVmDtFE9UgUjYWUYi4ffIHhTs+sRGQjcTRzT8P3RGoM5+IISueY6gv8TqhMa0R0COceuA== X-Received: by 2002:a05:600c:4448:b0:40b:5464:b23d with SMTP id v8-20020a05600c444800b0040b5464b23dmr1036337wmn.37.1701585694636; Sat, 02 Dec 2023 22:41:34 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id j1-20020adfe501000000b003332f1f51f4sm6541714wrm.94.2023.12.02.22.41.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Dec 2023 22:41:34 -0800 (PST) Message-ID: <57f9da7bba01af1e35d737460ae2bba0bb826cce.1701585683.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 03 Dec 2023 06:41:21 +0000 Subject: [PATCH 12/12] treewide: remove unnecessary includes in source files Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Elijah Newren , Elijah Newren From: Elijah Newren From: Elijah Newren Signed-off-by: Elijah Newren --- builtin/archive.c | 1 - builtin/commit-graph.c | 1 - builtin/fsck.c | 1 - builtin/fsmonitor--daemon.c | 2 -- builtin/grep.c | 1 - builtin/mktag.c | 1 - builtin/rev-list.c | 1 - builtin/send-pack.c | 1 - commit-graph.c | 1 - compat/simple-ipc/ipc-shared.c | 3 --- compat/simple-ipc/ipc-unix-socket.c | 1 - fsmonitor-ipc.c | 1 - http.c | 1 - line-log.c | 1 - merge-ort.c | 1 - notes-utils.c | 1 - ref-filter.c | 1 - remote-curl.c | 1 - repo-settings.c | 1 - t/helper/test-repository.c | 1 - trace2/tr2_ctr.c | 1 - trace2/tr2_tmr.c | 1 - 22 files changed, 25 deletions(-) diff --git a/builtin/archive.c b/builtin/archive.c index 90761fdfee0..15ee1ec7bb7 100644 --- a/builtin/archive.c +++ b/builtin/archive.c @@ -9,7 +9,6 @@ #include "parse-options.h" #include "pkt-line.h" #include "repository.h" -#include "sideband.h" static void create_output_file(const char *output_file) { diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index 81a28c6fcdd..666ad574a46 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -4,7 +4,6 @@ #include "environment.h" #include "gettext.h" #include "hex.h" -#include "lockfile.h" #include "parse-options.h" #include "repository.h" #include "commit-graph.h" diff --git a/builtin/fsck.c b/builtin/fsck.c index 9317b7b841d..a7cf94f67ed 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -10,7 +10,6 @@ #include "refs.h" #include "pack.h" #include "cache-tree.h" -#include "tree-walk.h" #include "fsck.h" #include "parse-options.h" #include "progress.h" diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c index 9f80b9eaff5..1593713f4cb 100644 --- a/builtin/fsmonitor--daemon.c +++ b/builtin/fsmonitor--daemon.c @@ -7,7 +7,6 @@ #include "parse-options.h" #include "fsmonitor-ll.h" #include "fsmonitor-ipc.h" -#include "fsmonitor-path-utils.h" #include "fsmonitor-settings.h" #include "compat/fsmonitor/fsm-health.h" #include "compat/fsmonitor/fsm-listen.h" @@ -15,7 +14,6 @@ #include "repository.h" #include "simple-ipc.h" #include "khash.h" -#include "pkt-line.h" #include "run-command.h" #include "trace.h" #include "trace2.h" diff --git a/builtin/grep.c b/builtin/grep.c index f076cc705b4..c8e33f97755 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -14,7 +14,6 @@ #include "parse-options.h" #include "string-list.h" #include "run-command.h" -#include "userdiff.h" #include "grep.h" #include "quote.h" #include "dir.h" diff --git a/builtin/mktag.c b/builtin/mktag.c index d8e0b5afc07..4767f1a97e6 100644 --- a/builtin/mktag.c +++ b/builtin/mktag.c @@ -3,7 +3,6 @@ #include "hex.h" #include "parse-options.h" #include "strbuf.h" -#include "tag.h" #include "replace-object.h" #include "object-file.h" #include "object-store-ll.h" diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 460ba7cbaa7..b3f47838580 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -12,7 +12,6 @@ #include "object-name.h" #include "object-file.h" #include "object-store-ll.h" -#include "pack.h" #include "pack-bitmap.h" #include "log-tree.h" #include "graph.h" diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 395f2e490d4..0b839f583a0 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -2,7 +2,6 @@ #include "config.h" #include "hex.h" #include "pkt-line.h" -#include "sideband.h" #include "run-command.h" #include "remote.h" #include "connect.h" diff --git a/commit-graph.c b/commit-graph.c index e7212400da3..15980cf9492 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -4,7 +4,6 @@ #include "gettext.h" #include "hex.h" #include "lockfile.h" -#include "pack.h" #include "packfile.h" #include "commit.h" #include "object.h" diff --git a/compat/simple-ipc/ipc-shared.c b/compat/simple-ipc/ipc-shared.c index e5e1dda8ccd..cb176d966f2 100644 --- a/compat/simple-ipc/ipc-shared.c +++ b/compat/simple-ipc/ipc-shared.c @@ -1,8 +1,5 @@ #include "git-compat-util.h" #include "simple-ipc.h" -#include "strbuf.h" -#include "pkt-line.h" -#include "thread-utils.h" #ifndef SUPPORTS_SIMPLE_IPC /* diff --git a/compat/simple-ipc/ipc-unix-socket.c b/compat/simple-ipc/ipc-unix-socket.c index b2f4f22ce44..9b3f2cdf8c9 100644 --- a/compat/simple-ipc/ipc-unix-socket.c +++ b/compat/simple-ipc/ipc-unix-socket.c @@ -2,7 +2,6 @@ #include "gettext.h" #include "simple-ipc.h" #include "strbuf.h" -#include "pkt-line.h" #include "thread-utils.h" #include "trace2.h" #include "unix-socket.h" diff --git a/fsmonitor-ipc.c b/fsmonitor-ipc.c index 153918cf768..45471b5b741 100644 --- a/fsmonitor-ipc.c +++ b/fsmonitor-ipc.c @@ -1,5 +1,4 @@ #include "git-compat-util.h" -#include "fsmonitor-ll.h" #include "gettext.h" #include "simple-ipc.h" #include "fsmonitor-ipc.h" diff --git a/http.c b/http.c index a64005ceb80..3565c4ec611 100644 --- a/http.c +++ b/http.c @@ -4,7 +4,6 @@ #include "http.h" #include "config.h" #include "pack.h" -#include "sideband.h" #include "run-command.h" #include "url.h" #include "urlmatch.h" diff --git a/line-log.c b/line-log.c index c276ccec549..8ff6ccb7724 100644 --- a/line-log.c +++ b/line-log.c @@ -12,7 +12,6 @@ #include "xdiff-interface.h" #include "strbuf.h" #include "log-tree.h" -#include "userdiff.h" #include "line-log.h" #include "setup.h" #include "strvec.h" diff --git a/merge-ort.c b/merge-ort.c index 2a0be468505..77ba7f3020c 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -41,7 +41,6 @@ #include "revision.h" #include "sparse-index.h" #include "strmap.h" -#include "submodule.h" #include "trace2.h" #include "tree.h" #include "unpack-trees.h" diff --git a/notes-utils.c b/notes-utils.c index 97c031c26ec..08e5dbc6073 100644 --- a/notes-utils.c +++ b/notes-utils.c @@ -5,7 +5,6 @@ #include "gettext.h" #include "refs.h" #include "notes-utils.h" -#include "repository.h" #include "strbuf.h" void create_notes_commit(struct repository *r, diff --git a/ref-filter.c b/ref-filter.c index 96959a3762c..01b90e325c2 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -29,7 +29,6 @@ #include "commit-reach.h" #include "worktree.h" #include "hashmap.h" -#include "strvec.h" static struct ref_msg { const char *gone; diff --git a/remote-curl.c b/remote-curl.c index 55eefa70f97..7f81bf3fafc 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -11,7 +11,6 @@ #include "run-command.h" #include "pkt-line.h" #include "string-list.h" -#include "sideband.h" #include "strvec.h" #include "credential.h" #include "oid-array.h" diff --git a/repo-settings.c b/repo-settings.c index 525f69c0c77..30cd4787627 100644 --- a/repo-settings.c +++ b/repo-settings.c @@ -2,7 +2,6 @@ #include "config.h" #include "repository.h" #include "midx.h" -#include "compat/fsmonitor/fsm-listen.h" static void repo_cfg_bool(struct repository *r, const char *key, int *dest, int def) diff --git a/t/helper/test-repository.c b/t/helper/test-repository.c index c925655c648..0c7c5aa4dd7 100644 --- a/t/helper/test-repository.c +++ b/t/helper/test-repository.c @@ -3,7 +3,6 @@ #include "commit.h" #include "environment.h" #include "hex.h" -#include "object-store-ll.h" #include "object.h" #include "repository.h" #include "setup.h" diff --git a/trace2/tr2_ctr.c b/trace2/tr2_ctr.c index 87cf9034fba..d3a33715c14 100644 --- a/trace2/tr2_ctr.c +++ b/trace2/tr2_ctr.c @@ -1,5 +1,4 @@ #include "git-compat-util.h" -#include "thread-utils.h" #include "trace2/tr2_tgt.h" #include "trace2/tr2_tls.h" #include "trace2/tr2_ctr.h" diff --git a/trace2/tr2_tmr.c b/trace2/tr2_tmr.c index 31d0e4d1bd1..51f564b07a4 100644 --- a/trace2/tr2_tmr.c +++ b/trace2/tr2_tmr.c @@ -1,5 +1,4 @@ #include "git-compat-util.h" -#include "thread-utils.h" #include "trace2/tr2_tgt.h" #include "trace2/tr2_tls.h" #include "trace2/tr2_tmr.h"