Header cleanups
PATCH v2 2/16 treewide: be explicit about dependence on gettext.h
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
Dozens of files made use of gettext functions, without explicitly including gettext.h. This made it more difficult to find which files could remove a dependence on cache.h. Make C files explicitly include gettext.h if they are using it.
However, while compat/fsmonitor/fsm-ipc-darwin.c should also gain an include of gettext.h, it was left out to avoid conflicting with an in-flight topic.
Signed-off-by Elijah Newren <[email protected]>
--- add-interactive.c | 1 + add-patch.c | 1 + apply.c | 1 + archive-tar.c | 1 + archive-zip.c | 1 + archive.c | 1 + attr.c | 1 + bisect.c | 1 + blame.c | 1 + branch.c | 1 + builtin/add.c | 1 + builtin/am.c | 1 + builtin/apply.c | 1 + builtin/archive.c | 1 + builtin/bisect.c | 1 + builtin/blame.c | 1 + builtin/branch.c | 1 + builtin/bugreport.c | 1 + builtin/bundle.c | 1 + builtin/cat-file.c | 1 + builtin/check-attr.c | 1 + builtin/check-ignore.c | 1 + builtin/check-mailmap.c | 1 + builtin/checkout--worker.c | 1 + builtin/checkout-index.c | 1 + builtin/checkout.c | 1 + builtin/clean.c | 1 + builtin/clone.c | 1 + builtin/column.c | 1 + builtin/commit-graph.c | 1 + builtin/commit-tree.c | 1 + builtin/commit.c | 1 + builtin/config.c | 1 + builtin/count-objects.c | 1 + builtin/credential-cache--daemon.c | 1 + builtin/credential-cache.c | 1 + builtin/credential-store.c | 1 + builtin/describe.c | 1 + builtin/diagnose.c | 1 + builtin/diff-tree.c | 1 + builtin/diff.c | 1 + builtin/difftool.c | 1 + builtin/fast-export.c | 1 + builtin/fast-import.c | 1 + builtin/fetch-pack.c | 1 + builtin/fetch.c | 1 + builtin/fmt-merge-msg.c | 1 + builtin/for-each-ref.c | 1 + builtin/for-each-repo.c | 1 + builtin/fsck.c | 1 + builtin/fsmonitor--daemon.c | 1 + builtin/gc.c | 1 + builtin/grep.c | 1 + builtin/hash-object.c | 1 + builtin/help.c | 1 + builtin/hook.c | 1 + builtin/index-pack.c | 1 + builtin/init-db.c | 1 + builtin/interpret-trailers.c | 1 + builtin/log.c | 1 + builtin/ls-files.c | 1 + builtin/ls-remote.c | 1 + builtin/ls-tree.c | 1 + builtin/mailinfo.c | 1 + builtin/mailsplit.c | 1 + builtin/merge-base.c | 1 + builtin/merge-file.c | 1 + builtin/merge-recursive.c | 1 + builtin/merge-tree.c | 1 + builtin/merge.c | 1 + builtin/mktag.c | 1 + builtin/mktree.c | 1 + builtin/multi-pack-index.c | 1 + builtin/mv.c | 1 + builtin/name-rev.c | 1 + builtin/notes.c | 1 + builtin/pack-objects.c | 1 + builtin/pack-redundant.c | 1 + builtin/pack-refs.c | 1 + builtin/patch-id.c | 1 + builtin/prune-packed.c | 1 + builtin/prune.c | 1 + builtin/pull.c | 1 + builtin/push.c | 1 + builtin/range-diff.c | 1 + builtin/read-tree.c | 1 + builtin/rebase.c | 1 + builtin/receive-pack.c | 1 + builtin/reflog.c | 1 + builtin/remote.c | 1 + builtin/repack.c | 1 + builtin/replace.c | 1 + builtin/rerere.c | 1 + builtin/reset.c | 1 + builtin/rev-list.c | 1 + builtin/rev-parse.c | 1 + builtin/revert.c | 1 + builtin/rm.c | 1 + builtin/shortlog.c | 1 + builtin/show-branch.c | 1 + builtin/show-index.c | 1 + builtin/show-ref.c | 1 + builtin/sparse-checkout.c | 1 + builtin/stash.c | 1 + builtin/stripspace.c | 1 + builtin/submodule--helper.c | 1 + builtin/symbolic-ref.c | 1 + builtin/tag.c | 1 + builtin/unpack-objects.c | 1 + builtin/update-index.c | 1 + builtin/update-ref.c | 1 + builtin/update-server-info.c | 1 + builtin/upload-pack.c | 1 + builtin/verify-commit.c | 1 + builtin/verify-pack.c | 1 + builtin/verify-tag.c | 1 + builtin/worktree.c | 1 + builtin/write-tree.c | 1 + bulk-checkin.c | 1 + bundle-uri.c | 1 + bundle.c | 1 + chunk-format.c | 1 + color.c | 1 + commit-graph.c | 1 + commit.c | 1 + common-main.c | 1 + compat/disk.h | 1 + compat/fsmonitor/fsm-health-win32.c | 1 + compat/fsmonitor/fsm-listen-darwin.c | 1 + compat/fsmonitor/fsm-listen-win32.c | 1 + compat/fsmonitor/fsm-path-utils-darwin.c | 1 + compat/fsmonitor/fsm-path-utils-win32.c | 1 + compat/mingw.c | 1 + compat/precompose_utf8.c | 1 + compat/simple-ipc/ipc-unix-socket.c | 1 + compat/simple-ipc/ipc-win32.c | 1 + compat/terminal.c | 1 + config.c | 1 + connect.c | 1 + connected.c | 1 + convert.c | 1 + credential.c | 1 + date.c | 1 + delta-islands.c | 1 + diagnose.c | 1 + diff-lib.c | 1 + diff-no-index.c | 1 + diff.c | 1 + dir.c | 1 + editor.c | 1 + entry.c | 1 + environment.c | 1 + exec-cmd.c | 1 + fetch-pack.c | 1 + fsmonitor-ipc.c | 1 + git.c | 1 + gpg-interface.c | 1 + grep.c | 1 + http-fetch.c | 1 + imap-send.c | 1 + list-objects-filter-options.h | 1 + list-objects-filter.c | 1 + list-objects.c | 1 + lockfile.c | 1 + ls-refs.c | 1 + merge-ort-wrappers.c | 1 + merge-ort.c | 1 + merge-recursive.c | 1 + merge.c | 1 + midx.c | 1 + name-hash.c | 1 + notes-merge.c | 1 + notes-utils.c | 1 + object-file.c | 1 + object-name.c | 1 + object.c | 1 + pack-bitmap-write.c | 1 + pack-bitmap.c | 1 + pack-mtimes.c | 1 + pack-revindex.c | 1 + pack-write.c | 1 + packfile.c | 1 + parallel-checkout.c | 1 + parse-options-cb.c | 1 + parse-options.c | 1 + parse-options.h | 2 ++ path.c | 1 + pathspec.c | 1 + pkt-line.c | 1 + preload-index.c | 1 + pretty.c | 1 + promisor-remote.c | 1 + prune-packed.c | 1 + range-diff.c | 1 + reachable.c | 1 + read-cache.c | 1 + rebase-interactive.c | 1 + ref-filter.c | 1 + ref-filter.h | 1 + reflog.c | 1 + refs.c | 1 + refs/files-backend.c | 1 + refs/packed-backend.c | 1 + remote-curl.c | 1 + remote.c | 1 + replace-object.c | 1 + rerere.c | 1 + rerere.h | 1 + reset.c | 1 + revision.c | 1 + run-command.c | 1 + send-pack.c | 1 + sequencer.c | 1 + setup.c | 1 + sideband.c | 1 + sparse-index.c | 1 + split-index.c | 1 + strbuf.c | 1 + submodule-config.c | 1 + submodule.c | 1 + symlinks.c | 1 + t/helper/test-cache-tree.c | 1 + t/helper/test-fast-rebase.c | 1 + t/helper/test-reach.c | 1 + t/helper/test-serve-v2.c | 1 + trailer.c | 1 + transport-helper.c | 1 + tree-walk.c | 1 + unpack-trees.c | 1 + upload-pack.c | 1 + usage.c | 2 +- walker.c | 1 + worktree.c | 1 + wrapper.c | 1 + wt-status.c | 1 + 235 files changed, 236 insertions(+), 1 deletion(-)
add-interactive.c +1 -0
@@ -3,6 +3,7 @@#include "color.h" #include "config.h" #include "diffcore.h" +#include "gettext.h" #include "hex.h" #include "revision.h" #include "refs.h"
add-patch.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "add-interactive.h" #include "alloc.h" +#include "gettext.h" #include "strbuf.h" #include "run-command.h" #include "strvec.h"
apply.c +1 -0
@@ -15,6 +15,7 @@#include "delta.h" #include "diff.h" #include "dir.h" +#include "gettext.h" #include "hex.h" #include "xdiff-interface.h" #include "ll-merge.h"
archive-tar.c +1 -0
@@ -4,6 +4,7 @@#include "git-compat-util.h" #include "alloc.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "tar.h" #include "archive.h"
archive-zip.c +1 -0
@@ -4,6 +4,7 @@#include "cache.h" #include "config.h" #include "archive.h" +#include "gettext.h" #include "hex.h" #include "streaming.h" #include "utf8.h"
archive.c +1 -0
@@ -1,6 +1,7 @@#include "git-compat-util.h" #include "alloc.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "refs.h" #include "object-store.h"
attr.c +1 -0
@@ -12,6 +12,7 @@#include "exec-cmd.h" #include "attr.h" #include "dir.h" +#include "gettext.h" #include "utf8.h" #include "quote.h" #include "revision.h"
bisect.c +1 -0
@@ -2,6 +2,7 @@#include "config.h" #include "commit.h" #include "diff.h" +#include "gettext.h" #include "hex.h" #include "revision.h" #include "refs.h"
blame.c +1 -0
@@ -5,6 +5,7 @@#include "mergesort.h" #include "diff.h" #include "diffcore.h" +#include "gettext.h" #include "hex.h" #include "tag.h" #include "blame.h"
branch.c +1 -0
@@ -2,6 +2,7 @@#include "cache.h" #include "config.h" #include "branch.h" +#include "gettext.h" #include "hex.h" #include "refs.h" #include "refspec.h"
builtin/add.c +1 -0
@@ -9,6 +9,7 @@#include "builtin.h" #include "lockfile.h" #include "dir.h" +#include "gettext.h" #include "pathspec.h" #include "exec-cmd.h" #include "cache-tree.h"
builtin/am.c +1 -0
@@ -8,6 +8,7 @@#include "config.h" #include "builtin.h" #include "exec-cmd.h" +#include "gettext.h" #include "hex.h" #include "parse-options.h" #include "dir.h"
builtin/apply.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "builtin.h" +#include "gettext.h" #include "parse-options.h" #include "apply.h"
builtin/archive.c +1 -0
@@ -5,6 +5,7 @@#include "cache.h" #include "builtin.h" #include "archive.h" +#include "gettext.h" #include "transport.h" #include "parse-options.h" #include "pkt-line.h"
builtin/bisect.c +1 -0
@@ -1,5 +1,6 @@#include "builtin.h" #include "cache.h" +#include "gettext.h" #include "hex.h" #include "parse-options.h" #include "bisect.h"
builtin/blame.c +1 -0
@@ -10,6 +10,7 @@#include "config.h" #include "color.h" #include "builtin.h" +#include "gettext.h" #include "hex.h" #include "repository.h" #include "commit.h"
builtin/branch.c +1 -0
@@ -11,6 +11,7 @@#include "refs.h" #include "commit.h" #include "builtin.h" +#include "gettext.h" #include "remote.h" #include "parse-options.h" #include "branch.h"
builtin/bugreport.c +1 -0
@@ -1,4 +1,5 @@#include "builtin.h" +#include "gettext.h" #include "parse-options.h" #include "strbuf.h" #include "help.h"
builtin/bundle.c +1 -0
@@ -1,4 +1,5 @@#include "builtin.h" +#include "gettext.h" #include "strvec.h" #include "parse-options.h" #include "cache.h"
builtin/cat-file.c +1 -0
@@ -9,6 +9,7 @@#include "config.h" #include "builtin.h" #include "diff.h" +#include "gettext.h" #include "hex.h" #include "ident.h" #include "parse-options.h"
builtin/check-attr.c +1 -0
@@ -3,6 +3,7 @@#include "cache.h" #include "config.h" #include "attr.h" +#include "gettext.h" #include "quote.h" #include "parse-options.h"
builtin/check-ignore.c +1 -0
@@ -3,6 +3,7 @@#include "cache.h" #include "config.h" #include "dir.h" +#include "gettext.h" #include "quote.h" #include "pathspec.h" #include "parse-options.h"
builtin/check-mailmap.c +1 -0
@@ -1,5 +1,6 @@#include "builtin.h" #include "config.h" +#include "gettext.h" #include "ident.h" #include "mailmap.h" #include "parse-options.h"
builtin/checkout--worker.c +1 -0
@@ -2,6 +2,7 @@#include "alloc.h" #include "config.h" #include "entry.h" +#include "gettext.h" #include "parallel-checkout.h" #include "parse-options.h" #include "pkt-line.h"
builtin/checkout-index.c +1 -0
@@ -8,6 +8,7 @@#include "builtin.h" #include "config.h" #include "dir.h" +#include "gettext.h" #include "lockfile.h" #include "quote.h" #include "cache-tree.h"
builtin/checkout.c +1 -0
@@ -9,6 +9,7 @@#include "config.h" #include "diff.h" #include "dir.h" +#include "gettext.h" #include "hex.h" #include "hook.h" #include "ll-merge.h"
builtin/clean.c +1 -0
@@ -11,6 +11,7 @@#include "cache.h" #include "config.h" #include "dir.h" +#include "gettext.h" #include "parse-options.h" #include "string-list.h" #include "quote.h"
builtin/clone.c +1 -0
@@ -11,6 +11,7 @@#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "lockfile.h" #include "parse-options.h"
builtin/column.c +1 -0
@@ -1,6 +1,7 @@#include "builtin.h" #include "cache.h" #include "config.h" +#include "gettext.h" #include "strbuf.h" #include "parse-options.h" #include "string-list.h"
builtin/commit-graph.c +1 -0
@@ -1,6 +1,7 @@#include "builtin.h" #include "config.h" #include "dir.h" +#include "gettext.h" #include "hex.h" #include "lockfile.h" #include "parse-options.h"
builtin/commit-tree.c +1 -0
@@ -5,6 +5,7 @@*/ #include "cache.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "object-store.h" #include "repository.h"
builtin/commit.c +1 -0
@@ -16,6 +16,7 @@#include "diff.h" #include "diffcore.h" #include "commit.h" +#include "gettext.h" #include "revision.h" #include "wt-status.h" #include "run-command.h"
builtin/config.c +1 -0
@@ -2,6 +2,7 @@#include "alloc.h" #include "config.h" #include "color.h" +#include "gettext.h" #include "ident.h" #include "parse-options.h" #include "urlmatch.h"
builtin/count-objects.c +1 -0
@@ -7,6 +7,7 @@#include "cache.h" #include "config.h" #include "dir.h" +#include "gettext.h" #include "repository.h" #include "builtin.h" #include "parse-options.h"
builtin/credential-cache--daemon.c +1 -0
@@ -1,5 +1,6 @@#include "builtin.h" #include "alloc.h" +#include "gettext.h" #include "parse-options.h" #ifndef NO_UNIX_SOCKETS
builtin/credential-cache.c +1 -0
@@ -1,4 +1,5 @@#include "builtin.h" +#include "gettext.h" #include "parse-options.h" #ifndef NO_UNIX_SOCKETS
builtin/credential-store.c +1 -0
@@ -1,5 +1,6 @@#include "builtin.h" #include "config.h" +#include "gettext.h" #include "lockfile.h" #include "credential.h" #include "string-list.h"
builtin/describe.c +1 -0
@@ -1,6 +1,7 @@#define USE_THE_INDEX_VARIABLE #include "cache.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "lockfile.h" #include "commit.h"
builtin/diagnose.c +1 -0
@@ -1,4 +1,5 @@#include "builtin.h" +#include "gettext.h" #include "parse-options.h" #include "diagnose.h"
builtin/diff-tree.c +1 -0
@@ -3,6 +3,7 @@#include "config.h" #include "diff.h" #include "commit.h" +#include "gettext.h" #include "hex.h" #include "log-tree.h" #include "builtin.h"
builtin/diff.c +1 -0
@@ -11,6 +11,7 @@#include "color.h" #include "commit.h" #include "blob.h" +#include "gettext.h" #include "tag.h" #include "diff.h" #include "diff-merges.h"
builtin/difftool.c +1 -0
@@ -17,6 +17,7 @@#include "builtin.h" #include "run-command.h" #include "exec-cmd.h" +#include "gettext.h" #include "hex.h" #include "parse-options.h" #include "strvec.h"
builtin/fast-export.c +1 -0
@@ -6,6 +6,7 @@#include "builtin.h" #include "cache.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "refs.h" #include "refspec.h"
builtin/fast-import.c +1 -0
@@ -1,5 +1,6 @@#include "builtin.h" #include "cache.h" +#include "gettext.h" #include "hex.h" #include "repository.h" #include "config.h"
builtin/fetch-pack.c +1 -0
@@ -1,5 +1,6 @@#include "builtin.h" #include "alloc.h" +#include "gettext.h" #include "hex.h" #include "pkt-line.h" #include "fetch-pack.h"
builtin/fetch.c +1 -0
@@ -3,6 +3,7 @@*/ #include "cache.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "repository.h" #include "refs.h"
builtin/fmt-merge-msg.c +1 -0
@@ -1,6 +1,7 @@#include "builtin.h" #include "config.h" #include "fmt-merge-msg.h" +#include "gettext.h" #include "parse-options.h" static const char *const fmt_merge_msg_usage[] = {
builtin/for-each-ref.c +1 -0
@@ -1,6 +1,7 @@#include "builtin.h" #include "cache.h" #include "config.h" +#include "gettext.h" #include "refs.h" #include "object.h" #include "parse-options.h"
builtin/for-each-repo.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "config.h" #include "builtin.h" +#include "gettext.h" #include "parse-options.h" #include "run-command.h" #include "string-list.h"
builtin/fsck.c +1 -0
@@ -1,5 +1,6 @@#include "builtin.h" #include "cache.h" +#include "gettext.h" #include "hex.h" #include "repository.h" #include "config.h"
builtin/fsmonitor--daemon.c +1 -0
@@ -1,6 +1,7 @@#include "builtin.h" #include "alloc.h" #include "config.h" +#include "gettext.h" #include "parse-options.h" #include "fsmonitor.h" #include "fsmonitor-ipc.h"
builtin/gc.c +1 -0
@@ -32,6 +32,7 @@#include "refs.h" #include "remote.h" #include "exec-cmd.h" +#include "gettext.h" #include "hook.h" #define FAILED_RUN "failed to run %s"
builtin/grep.c +1 -0
@@ -5,6 +5,7 @@*/ #include "cache.h" #include "alloc.h" +#include "gettext.h" #include "hex.h" #include "repository.h" #include "config.h"
builtin/hash-object.c +1 -0
@@ -6,6 +6,7 @@*/ #include "builtin.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "object-store.h" #include "blob.h"
builtin/help.c +1 -0
@@ -5,6 +5,7 @@#include "config.h" #include "builtin.h" #include "exec-cmd.h" +#include "gettext.h" #include "parse-options.h" #include "run-command.h" #include "config-list.h"
builtin/hook.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "builtin.h" #include "config.h" +#include "gettext.h" #include "hook.h" #include "parse-options.h" #include "strbuf.h"
builtin/index-pack.c +1 -0
@@ -2,6 +2,7 @@#include "alloc.h" #include "config.h" #include "delta.h" +#include "gettext.h" #include "hex.h" #include "pack.h" #include "csum-file.h"
builtin/init-db.c +1 -0
@@ -5,6 +5,7 @@*/ #include "cache.h" #include "config.h" +#include "gettext.h" #include "refs.h" #include "builtin.h" #include "exec-cmd.h"
builtin/interpret-trailers.c +1 -0
@@ -7,6 +7,7 @@#include "cache.h" #include "builtin.h" +#include "gettext.h" #include "parse-options.h" #include "string-list.h" #include "trailer.h"
builtin/log.c +1 -0
@@ -7,6 +7,7 @@#include "git-compat-util.h" #include "alloc.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "refs.h" #include "object-store.h"
builtin/ls-files.c +1 -0
@@ -11,6 +11,7 @@#include "quote.h" #include "dir.h" #include "builtin.h" +#include "gettext.h" #include "strbuf.h" #include "tree.h" #include "cache-tree.h"
builtin/ls-remote.c +1 -0
@@ -1,5 +1,6 @@#include "builtin.h" #include "cache.h" +#include "gettext.h" #include "hex.h" #include "transport.h" #include "ref-filter.h"
builtin/ls-tree.c +1 -0
@@ -5,6 +5,7 @@*/ #include "cache.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "object-store.h" #include "blob.h"
builtin/mailinfo.c +1 -0
@@ -4,6 +4,7 @@*/ #include "cache.h" #include "builtin.h" +#include "gettext.h" #include "utf8.h" #include "strbuf.h" #include "mailinfo.h"
builtin/mailsplit.c +1 -0
@@ -6,6 +6,7 @@*/ #include "cache.h" #include "builtin.h" +#include "gettext.h" #include "string-list.h" #include "strbuf.h"
builtin/merge-base.c +1 -0
@@ -2,6 +2,7 @@#include "cache.h" #include "config.h" #include "commit.h" +#include "gettext.h" #include "hex.h" #include "refs.h" #include "diff.h"
builtin/merge-file.c +1 -0
@@ -1,6 +1,7 @@#include "builtin.h" #include "cache.h" #include "config.h" +#include "gettext.h" #include "xdiff/xdiff.h" #include "xdiff-interface.h" #include "parse-options.h"
builtin/merge-recursive.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "builtin.h" #include "commit.h" +#include "gettext.h" #include "tag.h" #include "merge-recursive.h" #include "xdiff-interface.h"
builtin/merge-tree.c +1 -0
@@ -3,6 +3,7 @@#include "tree-walk.h" #include "xdiff-interface.h" #include "help.h" +#include "gettext.h" #include "hex.h" #include "commit.h" #include "commit-reach.h"
builtin/merge.c +1 -0
@@ -10,6 +10,7 @@#include "cache.h" #include "alloc.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "parse-options.h" #include "builtin.h"
builtin/mktag.c +1 -0
@@ -1,4 +1,5 @@#include "builtin.h" +#include "gettext.h" #include "hex.h" #include "parse-options.h" #include "tag.h"
builtin/mktree.c +1 -0
@@ -5,6 +5,7 @@*/ #include "builtin.h" #include "alloc.h" +#include "gettext.h" #include "hex.h" #include "quote.h" #include "tree.h"
builtin/multi-pack-index.c +1 -0
@@ -1,6 +1,7 @@#include "builtin.h" #include "cache.h" #include "config.h" +#include "gettext.h" #include "parse-options.h" #include "midx.h" #include "trace2.h"
builtin/mv.c +1 -0
@@ -7,6 +7,7 @@#include "builtin.h" #include "alloc.h" #include "config.h" +#include "gettext.h" #include "pathspec.h" #include "lockfile.h" #include "dir.h"
builtin/name-rev.c +1 -0
@@ -1,5 +1,6 @@#include "builtin.h" #include "alloc.h" +#include "gettext.h" #include "hex.h" #include "repository.h" #include "config.h"
builtin/notes.c +1 -0
@@ -10,6 +10,7 @@#include "cache.h" #include "config.h" #include "builtin.h" +#include "gettext.h" #include "hex.h" #include "notes.h" #include "object-store.h"
builtin/pack-objects.c +1 -0
@@ -1,5 +1,6 @@#include "builtin.h" #include "alloc.h" +#include "gettext.h" #include "hex.h" #include "repository.h" #include "config.h"
builtin/pack-redundant.c +1 -0
@@ -7,6 +7,7 @@*/ #include "builtin.h" +#include "gettext.h" #include "hex.h" #include "repository.h" #include "packfile.h"
builtin/pack-refs.c +1 -0
@@ -1,5 +1,6 @@#include "builtin.h" #include "config.h" +#include "gettext.h" #include "parse-options.h" #include "refs.h" #include "repository.h"
builtin/patch-id.c +1 -0
@@ -2,6 +2,7 @@#include "builtin.h" #include "config.h" #include "diff.h" +#include "gettext.h" #include "hex.h" #include "parse-options.h"
builtin/prune-packed.c +1 -0
@@ -1,4 +1,5 @@#include "builtin.h" +#include "gettext.h" #include "parse-options.h" #include "prune-packed.h"
builtin/prune.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "commit.h" #include "diff.h" +#include "gettext.h" #include "hex.h" #include "revision.h" #include "builtin.h"
builtin/pull.c +1 -0
@@ -9,6 +9,7 @@#include "cache.h" #include "config.h" #include "builtin.h" +#include "gettext.h" #include "hex.h" #include "parse-options.h" #include "exec-cmd.h"
builtin/push.c +1 -0
@@ -4,6 +4,7 @@#include "cache.h" #include "branch.h" #include "config.h" +#include "gettext.h" #include "refs.h" #include "refspec.h" #include "run-command.h"
builtin/range-diff.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "builtin.h" +#include "gettext.h" #include "parse-options.h" #include "range-diff.h" #include "config.h"
builtin/read-tree.c +1 -0
@@ -7,6 +7,7 @@#define USE_THE_INDEX_VARIABLE #include "cache.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "lockfile.h" #include "object.h"
builtin/rebase.c +1 -0
@@ -6,6 +6,7 @@#define USE_THE_INDEX_VARIABLE #include "builtin.h" +#include "gettext.h" #include "hex.h" #include "run-command.h" #include "exec-cmd.h"
builtin/receive-pack.c +1 -0
@@ -1,6 +1,7 @@#include "builtin.h" #include "repository.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "lockfile.h" #include "pack.h"
builtin/reflog.c +1 -0
@@ -1,5 +1,6 @@#include "builtin.h" #include "config.h" +#include "gettext.h" #include "revision.h" #include "reachable.h" #include "worktree.h"
builtin/remote.c +1 -0
@@ -1,5 +1,6 @@#include "builtin.h" #include "config.h" +#include "gettext.h" #include "parse-options.h" #include "transport.h" #include "remote.h"
builtin/repack.c +1 -0
@@ -2,6 +2,7 @@#include "alloc.h" #include "config.h" #include "dir.h" +#include "gettext.h" #include "hex.h" #include "parse-options.h" #include "run-command.h"
builtin/replace.c +1 -0
@@ -11,6 +11,7 @@#include "cache.h" #include "config.h" #include "builtin.h" +#include "gettext.h" #include "hex.h" #include "refs.h" #include "parse-options.h"
builtin/rerere.c +1 -0
@@ -2,6 +2,7 @@#include "cache.h" #include "config.h" #include "dir.h" +#include "gettext.h" #include "parse-options.h" #include "string-list.h" #include "rerere.h"
builtin/reset.c +1 -0
@@ -10,6 +10,7 @@#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "lockfile.h" #include "tag.h"
builtin/rev-list.c +1 -0
@@ -2,6 +2,7 @@#include "config.h" #include "commit.h" #include "diff.h" +#include "gettext.h" #include "hex.h" #include "revision.h" #include "list-objects.h"
builtin/rev-parse.c +1 -0
@@ -8,6 +8,7 @@#include "alloc.h" #include "config.h" #include "commit.h" +#include "gettext.h" #include "hex.h" #include "refs.h" #include "quote.h"
builtin/revert.c +1 -0
@@ -4,6 +4,7 @@#include "builtin.h" #include "parse-options.h" #include "diff.h" +#include "gettext.h" #include "revision.h" #include "rerere.h" #include "dir.h"
builtin/rm.c +1 -0
@@ -11,6 +11,7 @@#include "lockfile.h" #include "dir.h" #include "cache-tree.h" +#include "gettext.h" #include "tree-walk.h" #include "parse-options.h" #include "string-list.h"
builtin/shortlog.c +1 -0
@@ -3,6 +3,7 @@#include "config.h" #include "commit.h" #include "diff.h" +#include "gettext.h" #include "string-list.h" #include "revision.h" #include "utf8.h"
builtin/show-branch.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "pretty.h" #include "refs.h"
builtin/show-index.c +1 -0
@@ -1,5 +1,6 @@#include "builtin.h" #include "cache.h" +#include "gettext.h" #include "hex.h" #include "pack.h" #include "parse-options.h"
builtin/show-ref.c +1 -0
@@ -1,6 +1,7 @@#include "builtin.h" #include "cache.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "refs.h" #include "object-store.h"
builtin/sparse-checkout.c +1 -0
@@ -2,6 +2,7 @@#include "cache.h" #include "config.h" #include "dir.h" +#include "gettext.h" #include "parse-options.h" #include "pathspec.h" #include "repository.h"
builtin/stash.c +1 -0
@@ -1,6 +1,7 @@#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "parse-options.h" #include "refs.h"
builtin/stripspace.c +1 -0
@@ -1,6 +1,7 @@#include "builtin.h" #include "cache.h" #include "config.h" +#include "gettext.h" #include "parse-options.h" #include "strbuf.h"
builtin/submodule--helper.c +1 -0
@@ -1,6 +1,7 @@#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "alloc.h" +#include "gettext.h" #include "hex.h" #include "repository.h" #include "cache.h"
builtin/symbolic-ref.c +1 -0
@@ -1,6 +1,7 @@#include "builtin.h" #include "config.h" #include "cache.h" +#include "gettext.h" #include "refs.h" #include "parse-options.h"
builtin/tag.c +1 -0
@@ -9,6 +9,7 @@#include "cache.h" #include "config.h" #include "builtin.h" +#include "gettext.h" #include "hex.h" #include "refs.h" #include "object-store.h"
builtin/unpack-objects.c +1 -0
@@ -2,6 +2,7 @@#include "cache.h" #include "bulk-checkin.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "object-store.h" #include "object.h"
builtin/update-index.c +1 -0
@@ -7,6 +7,7 @@#include "cache.h" #include "bulk-checkin.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "lockfile.h" #include "quote.h"
builtin/update-ref.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "config.h" +#include "gettext.h" #include "refs.h" #include "builtin.h" #include "parse-options.h"
builtin/update-server-info.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "config.h" #include "builtin.h" +#include "gettext.h" #include "parse-options.h" static const char *const update_server_info_usage[] = {
builtin/upload-pack.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "builtin.h" #include "exec-cmd.h" +#include "gettext.h" #include "pkt-line.h" #include "parse-options.h" #include "protocol.h"
builtin/verify-commit.c +1 -0
@@ -8,6 +8,7 @@#include "cache.h" #include "config.h" #include "builtin.h" +#include "gettext.h" #include "object-store.h" #include "repository.h" #include "commit.h"
builtin/verify-pack.c +1 -0
@@ -1,6 +1,7 @@#include "builtin.h" #include "cache.h" #include "config.h" +#include "gettext.h" #include "run-command.h" #include "parse-options.h"
builtin/verify-tag.c +1 -0
@@ -8,6 +8,7 @@#include "cache.h" #include "config.h" #include "builtin.h" +#include "gettext.h" #include "tag.h" #include "run-command.h" #include "parse-options.h"
builtin/worktree.c +1 -0
@@ -3,6 +3,7 @@#include "config.h" #include "builtin.h" #include "dir.h" +#include "gettext.h" #include "hex.h" #include "parse-options.h" #include "strvec.h"
builtin/write-tree.c +1 -0
@@ -7,6 +7,7 @@#include "builtin.h" #include "cache.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "tree.h" #include "cache-tree.h"
bulk-checkin.c +1 -0
@@ -4,6 +4,7 @@#include "git-compat-util.h" #include "alloc.h" #include "bulk-checkin.h" +#include "gettext.h" #include "hex.h" #include "lockfile.h" #include "repository.h"
bundle-uri.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "bundle-uri.h" #include "bundle.h" +#include "gettext.h" #include "object-store.h" #include "refs.h" #include "run-command.h"
bundle.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "lockfile.h" #include "bundle.h" +#include "gettext.h" #include "hex.h" #include "object-store.h" #include "repository.h"
chunk-format.c +1 -0
@@ -2,6 +2,7 @@#include "alloc.h" #include "chunk-format.h" #include "csum-file.h" +#include "gettext.h" /* * When writing a chunk-based file format, collect the chunks in
color.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "config.h" #include "color.h" +#include "gettext.h" #include "hex.h" static int git_use_color_default =GIT_COLOR_AUTO ;
commit-graph.c +1 -0
@@ -1,5 +1,6 @@#include "git-compat-util.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "lockfile.h" #include "pack.h"
commit.c +1 -0
@@ -2,6 +2,7 @@#include "tag.h" #include "commit.h" #include "commit-graph.h" +#include "gettext.h" #include "hex.h" #include "repository.h" #include "object-store.h"
common-main.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "exec-cmd.h" +#include "gettext.h" #include "attr.h" /*
compat/disk.h +1 -0
@@ -2,6 +2,7 @@#define COMPAT_DISK_H #include "git-compat-util.h" +#include "gettext.h" static int get_disk_info (struct strbuf *out) {
compat/fsmonitor/fsm-health-win32.c +1 -0
@@ -3,6 +3,7 @@#include "fsmonitor.h" #include "fsm-health.h" #include "fsmonitor--daemon.h" +#include "gettext.h" /* * Every minute wake up and test our health.
compat/fsmonitor/fsm-listen-darwin.c +1 -0
@@ -28,6 +28,7 @@#include "fsm-listen.h" #include "fsmonitor--daemon.h" #include "fsmonitor-path-utils.h" +#include "gettext.h" struct fsm_listen_data {
compat/fsmonitor/fsm-listen-win32.c +1 -0
@@ -3,6 +3,7 @@#include "fsmonitor.h" #include "fsm-listen.h" #include "fsmonitor--daemon.h" +#include "gettext.h" /* * The documentation of ReadDirectoryChangesW() states that the maximum
compat/fsmonitor/fsm-path-utils-darwin.c +1 -0
@@ -1,5 +1,6 @@#include "fsmonitor.h" #include "fsmonitor-path-utils.h" +#include "gettext.h" #include <dirent.h> #include <errno.h> #include <fcntl.h>
compat/fsmonitor/fsm-path-utils-win32.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "fsmonitor.h" #include "fsmonitor-path-utils.h" +#include "gettext.h" /* * Check remote working directory protocol.
compat/mingw.c +1 -0
@@ -11,6 +11,7 @@#include "win32/lazyload.h" #include "../config.h" #include "dir.h" +#include "gettext.h" #define SECURITY_WIN32 #include <sspi.h>
compat/precompose_utf8.c +1 -0
@@ -7,6 +7,7 @@#include "cache.h" #include "config.h" +#include "gettext.h" #include "utf8.h" #include "precompose_utf8.h"
compat/simple-ipc/ipc-unix-socket.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "gettext.h" #include "simple-ipc.h" #include "strbuf.h" #include "pkt-line.h"
compat/simple-ipc/ipc-win32.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "gettext.h" #include "simple-ipc.h" #include "strbuf.h" #include "pkt-line.h"
compat/terminal.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "compat/terminal.h" +#include "gettext.h" #include "sigchain.h" #include "strbuf.h" #include "run-command.h"
config.c +1 -0
@@ -11,6 +11,7 @@#include "branch.h" #include "config.h" #include "environment.h" +#include "gettext.h" #include "ident.h" #include "repository.h" #include "lockfile.h"
connect.c +1 -0
@@ -1,6 +1,7 @@#include "git-compat-util.h" #include "cache.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "pkt-line.h" #include "quote.h"
connected.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "gettext.h" #include "hex.h" #include "object-store.h" #include "run-command.h"
convert.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "object-store.h" #include "attr.h"
credential.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "config.h" #include "credential.h" +#include "gettext.h" #include "string-list.h" #include "run-command.h" #include "url.h"
date.c +1 -0
@@ -6,6 +6,7 @@#include "cache.h" #include "date.h" +#include "gettext.h" /* * This is like mktime, but without normalization of tm_wday and tm_yday.
delta-islands.c +1 -0
@@ -4,6 +4,7 @@#include "object.h" #include "blob.h" #include "commit.h" +#include "gettext.h" #include "hex.h" #include "tag.h" #include "tree.h"
diagnose.c +1 -0
@@ -4,6 +4,7 @@#include "archive.h" #include "dir.h" #include "help.h" +#include "gettext.h" #include "hex.h" #include "strvec.h" #include "object-store.h"
diff-lib.c +1 -0
@@ -6,6 +6,7 @@#include "commit.h" #include "diff.h" #include "diffcore.h" +#include "gettext.h" #include "hex.h" #include "revision.h" #include "cache-tree.h"
diff-no-index.c +1 -0
@@ -11,6 +11,7 @@#include "tag.h" #include "diff.h" #include "diffcore.h" +#include "gettext.h" #include "revision.h" #include "log-tree.h" #include "parse-options.h"
diff.c +1 -0
@@ -4,6 +4,7 @@#include "cache.h" #include "alloc.h" #include "config.h" +#include "gettext.h" #include "tempfile.h" #include "quote.h" #include "diff.h"
dir.c +1 -0
@@ -9,6 +9,7 @@#include "alloc.h" #include "config.h" #include "dir.h" +#include "gettext.h" #include "object-store.h" #include "attr.h" #include "refs.h"
editor.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "config.h" +#include "gettext.h" #include "strbuf.h" #include "strvec.h" #include "run-command.h"
entry.c +1 -0
@@ -2,6 +2,7 @@#include "blob.h" #include "object-store.h" #include "dir.h" +#include "gettext.h" #include "hex.h" #include "streaming.h" #include "submodule.h"
environment.c +1 -0
@@ -10,6 +10,7 @@#include "cache.h" #include "branch.h" #include "environment.h" +#include "gettext.h" #include "repository.h" #include "config.h" #include "refs.h"
exec-cmd.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "exec-cmd.h" +#include "gettext.h" #include "quote.h" #include "strvec.h"
fetch-pack.c +1 -0
@@ -2,6 +2,7 @@#include "alloc.h" #include "repository.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "lockfile.h" #include "refs.h"
fsmonitor-ipc.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "fsmonitor.h" +#include "gettext.h" #include "simple-ipc.h" #include "fsmonitor-ipc.h" #include "run-command.h"
git.c +1 -0
@@ -1,6 +1,7 @@#include "builtin.h" #include "config.h" #include "exec-cmd.h" +#include "gettext.h" #include "help.h" #include "run-command.h" #include "alias.h"
gpg-interface.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "commit.h" #include "config.h" +#include "gettext.h" #include "run-command.h" #include "strbuf.h" #include "dir.h"
grep.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "config.h" +#include "gettext.h" #include "grep.h" #include "hex.h" #include "object-store.h"
http-fetch.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "config.h" #include "exec-cmd.h" +#include "gettext.h" #include "hex.h" #include "http.h" #include "walker.h"
imap-send.c +1 -0
@@ -25,6 +25,7 @@#include "config.h" #include "credential.h" #include "exec-cmd.h" +#include "gettext.h" #include "run-command.h" #include "parse-options.h" #if defined(NO_OPENSSL ) && !defined(HAVE_OPENSSL_CSPRNG )
list-objects-filter-options.h +1 -0
@@ -1,6 +1,7 @@#ifndef LIST_OBJECTS_FILTER_OPTIONS_H #define LIST_OBJECTS_FILTER_OPTIONS_H +#include "gettext.h" #include "object.h" #include "parse-options.h" #include "string-list.h"
list-objects-filter.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "alloc.h" #include "dir.h" +#include "gettext.h" #include "hex.h" #include "tag.h" #include "commit.h"
list-objects.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "tag.h" #include "commit.h" +#include "gettext.h" #include "hex.h" #include "tree.h" #include "blob.h"
lockfile.c +1 -0
@@ -3,6 +3,7 @@*/ #include "cache.h" +#include "gettext.h" #include "lockfile.h" /*
ls-refs.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "gettext.h" #include "hex.h" #include "repository.h" #include "refs.h"
merge-ort-wrappers.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "gettext.h" #include "merge-ort.h" #include "merge-ort-wrappers.h"
merge-ort.c +1 -0
@@ -26,6 +26,7 @@#include "diff.h" #include "diffcore.h" #include "dir.h" +#include "gettext.h" #include "hex.h" #include "entry.h" #include "ll-merge.h"
merge-recursive.c +1 -0
@@ -17,6 +17,7 @@#include "diff.h" #include "diffcore.h" #include "dir.h" +#include "gettext.h" #include "hex.h" #include "ll-merge.h" #include "lockfile.h"
merge.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "diff.h" #include "diffcore.h" +#include "gettext.h" #include "hex.h" #include "lockfile.h" #include "commit.h"
midx.c +1 -0
@@ -3,6 +3,7 @@#include "config.h" #include "csum-file.h" #include "dir.h" +#include "gettext.h" #include "hex.h" #include "lockfile.h" #include "packfile.h"
name-hash.c +1 -0
@@ -6,6 +6,7 @@* Copyright (C) 2008 Linus Torvalds */ #include "cache.h" +#include "gettext.h" #include "thread-utils.h" #include "trace2.h" #include "sparse-index.h"
notes-merge.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "commit.h" +#include "gettext.h" #include "refs.h" #include "object-store.h" #include "repository.h"
notes-utils.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "config.h" #include "commit.h" +#include "gettext.h" #include "refs.h" #include "notes-utils.h" #include "repository.h"
object-file.c +1 -0
@@ -9,6 +9,7 @@#include "git-compat-util.h" #include "alloc.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "string-list.h" #include "lockfile.h"
object-name.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "tag.h" #include "commit.h"
object.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "gettext.h" #include "hex.h" #include "object.h" #include "replace-object.h"
pack-bitmap-write.c +1 -0
@@ -1,5 +1,6 @@#include "git-compat-util.h" #include "alloc.h" +#include "gettext.h" #include "hex.h" #include "object-store.h" #include "commit.h"
pack-bitmap.c +1 -0
@@ -1,6 +1,7 @@#include "git-compat-util.h" #include "alloc.h" #include "commit.h" +#include "gettext.h" #include "hex.h" #include "strbuf.h" #include "tag.h"
pack-mtimes.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "gettext.h" #include "pack-mtimes.h" #include "object-store.h" #include "packfile.h"
pack-revindex.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "gettext.h" #include "pack-revindex.h" #include "object-store.h" #include "packfile.h"
pack-write.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "gettext.h" #include "hex.h" #include "pack.h" #include "csum-file.h"
packfile.c +1 -0
@@ -1,5 +1,6 @@#include "git-compat-util.h" #include "alloc.h" +#include "gettext.h" #include "hex.h" #include "list.h" #include "pack.h"
parallel-checkout.c +1 -0
@@ -2,6 +2,7 @@#include "alloc.h" #include "config.h" #include "entry.h" +#include "gettext.h" #include "hex.h" #include "parallel-checkout.h" #include "pkt-line.h"
parse-options-cb.c +1 -0
@@ -4,6 +4,7 @@#include "cache.h" #include "commit.h" #include "color.h" +#include "gettext.h" #include "string-list.h" #include "strvec.h" #include "oid-array.h"
parse-options.c +1 -0
@@ -4,6 +4,7 @@#include "config.h" #include "commit.h" #include "color.h" +#include "gettext.h" #include "utf8.h" static int disallow_abbreviated_options;
parse-options.h +2 -0
@@ -1,6 +1,8 @@#ifndef PARSE_OPTIONS_H #define PARSE_OPTIONS_H +#include "gettext.h" +/** * Refer to Documentation/technical/api-parse-options.txt for the API doc. */
path.c +1 -0
@@ -2,6 +2,7 @@* Utilities for paths and pathnames */ #include "cache.h" +#include "gettext.h" #include "hex.h" #include "repository.h" #include "strbuf.h"
pathspec.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "config.h" #include "dir.h" +#include "gettext.h" #include "pathspec.h" #include "attr.h" #include "strvec.h"
pkt-line.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "pkt-line.h" +#include "gettext.h" #include "hex.h" #include "run-command.h"
preload-index.c +1 -0
@@ -5,6 +5,7 @@#include "pathspec.h" #include "dir.h" #include "fsmonitor.h" +#include "gettext.h" #include "config.h" #include "progress.h" #include "thread-utils.h"
pretty.c +1 -0
@@ -2,6 +2,7 @@#include "alloc.h" #include "config.h" #include "commit.h" +#include "gettext.h" #include "hex.h" #include "utf8.h" #include "diff.h"
promisor-remote.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "gettext.h" #include "hex.h" #include "object-store.h" #include "promisor-remote.h"
prune-packed.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "gettext.h" #include "object-store.h" #include "packfile.h" #include "progress.h"
range-diff.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "gettext.h" #include "range-diff.h" #include "string-list.h" #include "run-command.h"
reachable.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "gettext.h" #include "hex.h" #include "refs.h" #include "tag.h"
read-cache.c +1 -0
@@ -18,6 +18,7 @@#include "tree.h" #include "commit.h" #include "blob.h" +#include "gettext.h" #include "resolve-undo.h" #include "run-command.h" #include "strbuf.h"
rebase-interactive.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "commit.h" +#include "gettext.h" #include "sequencer.h" #include "rebase-interactive.h" #include "strbuf.h"
ref-filter.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "alloc.h" +#include "gettext.h" #include "hex.h" #include "parse-options.h" #include "refs.h"
ref-filter.h +1 -0
@@ -1,6 +1,7 @@#ifndef REF_FILTER_H #define REF_FILTER_H +#include "gettext.h" #include "oid-array.h" #include "refs.h" #include "commit.h"
reflog.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "gettext.h" #include "object-store.h" #include "reflog.h" #include "refs.h"
refs.c +1 -0
@@ -6,6 +6,7 @@#include "alloc.h" #include "config.h" #include "hashmap.h" +#include "gettext.h" #include "hex.h" #include "lockfile.h" #include "iterator.h"
refs/files-backend.c +1 -0
@@ -1,5 +1,6 @@#include "../cache.h" #include "../config.h" +#include "../gettext.h" #include "../hex.h" #include "../refs.h" #include "refs-internal.h"
refs/packed-backend.c +1 -0
@@ -1,6 +1,7 @@#include "../cache.h" #include "../alloc.h" #include "../config.h" +#include "../gettext.h" #include "../hex.h" #include "../refs.h" #include "refs-internal.h"
remote-curl.c +1 -0
@@ -1,6 +1,7 @@#include "git-compat-util.h" #include "alloc.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "remote.h" #include "connect.h"
remote.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "alloc.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "remote.h" #include "urlmatch.h"
replace-object.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "gettext.h" #include "hex.h" #include "oidmap.h" #include "object-store.h"
rerere.c +1 -0
@@ -1,6 +1,7 @@#include "git-compat-util.h" #include "alloc.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "lockfile.h" #include "string-list.h"
rerere.h +1 -0
@@ -1,6 +1,7 @@#ifndef RERERE_H #define RERERE_H +#include "gettext.h" #include "string-list.h" struct pathspec ;
reset.c +1 -0
@@ -1,5 +1,6 @@#include "git-compat-util.h" #include "cache-tree.h" +#include "gettext.h" #include "hex.h" #include "lockfile.h" #include "refs.h"
revision.c +1 -0
@@ -1,6 +1,7 @@#include "git-compat-util.h" #include "alloc.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "object-store.h" #include "tag.h"
run-command.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "run-command.h" #include "exec-cmd.h" +#include "gettext.h" #include "sigchain.h" #include "strvec.h" #include "thread-utils.h"
send-pack.c +1 -0
@@ -1,6 +1,7 @@#include "git-compat-util.h" #include "config.h" #include "commit.h" +#include "gettext.h" #include "hex.h" #include "refs.h" #include "object-store.h"
sequencer.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "alloc.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "lockfile.h" #include "dir.h"
setup.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "gettext.h" #include "repository.h" #include "config.h" #include "dir.h"
sideband.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "color.h" #include "config.h" +#include "gettext.h" #include "sideband.h" #include "help.h" #include "pkt-line.h"
sparse-index.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "alloc.h" +#include "gettext.h" #include "repository.h" #include "sparse-index.h" #include "tree.h"
split-index.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "alloc.h" +#include "gettext.h" #include "split-index.h" #include "ewah/ewok.h"
strbuf.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "alloc.h" +#include "gettext.h" #include "hex.h" #include "refs.h" #include "string-list.h"
submodule-config.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "alloc.h" #include "dir.h" +#include "gettext.h" #include "hex.h" #include "repository.h" #include "config.h"
submodule.c +1 -0
@@ -7,6 +7,7 @@#include "dir.h" #include "diff.h" #include "commit.h" +#include "gettext.h" #include "hex.h" #include "revision.h" #include "run-command.h"
symlinks.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "gettext.h" static int threaded_check_leading_path (struct cache_def *cache,const char *name,int len,int warn_on_lstat_err);
t/helper/test-cache-tree.c +1 -0
@@ -1,6 +1,7 @@#define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "cache.h" +#include "gettext.h" #include "hex.h" #include "tree.h" #include "cache-tree.h"
t/helper/test-fast-rebase.c +1 -0
@@ -15,6 +15,7 @@#include "cache.h" #include "cache-tree.h" #include "commit.h" +#include "gettext.h" #include "hex.h" #include "lockfile.h" #include "merge-ort.h"
t/helper/test-reach.c +1 -0
@@ -4,6 +4,7 @@#include "commit.h" #include "commit-reach.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "parse-options.h" #include "ref-filter.h"
t/helper/test-serve-v2.c +1 -0
@@ -1,5 +1,6 @@#include "test-tool.h" #include "cache.h" +#include "gettext.h" #include "parse-options.h" #include "serve.h"
trailer.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "alloc.h" #include "config.h" +#include "gettext.h" #include "string-list.h" #include "run-command.h" #include "commit.h"
transport-helper.c +1 -0
@@ -4,6 +4,7 @@#include "run-command.h" #include "commit.h" #include "diff.h" +#include "gettext.h" #include "hex.h" #include "revision.h" #include "remote.h"
tree-walk.c +1 -0
@@ -2,6 +2,7 @@#include "tree-walk.h" #include "alloc.h" #include "dir.h" +#include "gettext.h" #include "hex.h" #include "object-store.h" #include "tree.h"
unpack-trees.c +1 -0
@@ -3,6 +3,7 @@#include "repository.h" #include "config.h" #include "dir.h" +#include "gettext.h" #include "hex.h" #include "tree.h" #include "tree-walk.h"
upload-pack.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "config.h" +#include "gettext.h" #include "hex.h" #include "refs.h" #include "pkt-line.h"
usage.c +1 -1
@@ -3,8 +3,8 @@* * Copyright (C) Linus Torvalds, 2005 */ -#include "git-compat-util.h" #include "cache.h" +#include "gettext.h" static void vreportf (const char *prefix,const char *err,va_list params) {
walker.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "gettext.h" #include "hex.h" #include "walker.h" #include "repository.h"
worktree.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "alloc.h" +#include "gettext.h" #include "repository.h" #include "refs.h" #include "strbuf.h"
wrapper.c +1 -0
@@ -3,6 +3,7 @@*/ #include "cache.h" #include "config.h" +#include "gettext.h" static intmax_t count_fsync_writeout_only;static intmax_t count_fsync_hardware_flush;
wt-status.c +1 -0
@@ -4,6 +4,7 @@#include "dir.h" #include "commit.h" #include "diff.h" +#include "gettext.h" #include "hex.h" #include "revision.h" #include "diffcore.h"
Signature · 1 line
gitgitgadget
PATCH v2 3/16 treewide: remove unnecessary inclusion of gettext.h
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
Looking at things from the opposite angle of the last patch, we had a few files that were including gettext.h and perhaps needed it at some point in history, but no longer require it. Remove the include.
Signed-off-by Elijah Newren <[email protected]>
--- progress.c | 1 - t/helper/test-parse-pathspec-file.c | 1 - t/helper/test-progress.c | 1 - t/helper/test-run-command.c | 1 - 4 files changed, 4 deletions(-)
progress.c +0 -1
@@ -10,7 +10,6 @@#define GIT_TEST_PROGRESS_ONLY #include "cache.h" -#include "gettext.h" #include "progress.h" #include "strbuf.h" #include "trace.h"
t/helper/test-parse-pathspec-file.c +0 -1
@@ -1,7 +1,6 @@#include "test-tool.h" #include "parse-options.h" #include "pathspec.h" -#include "gettext.h" int cmd__parse_pathspec_file (int argc,const char **argv) {
t/helper/test-progress.c +0 -1
@@ -19,7 +19,6 @@*/ #define GIT_TEST_PROGRESS_ONLY #include "test-tool.h" -#include "gettext.h" #include "parse-options.h" #include "progress.h" #include "strbuf.h"
t/helper/test-run-command.c +0 -1
@@ -16,7 +16,6 @@#include "string-list.h" #include "thread-utils.h" #include "wildmatch.h" -#include "gettext.h" static int number_callbacks; static int parallel_next(struct child_process *cp,
Signature · 1 line
gitgitgadget
PATCH v2 4/16 treewide: remove unnecessary cache.h inclusion from several sources
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
A number of files were apparently including cache.h solely to get gettext.h. By making those files explicitly include gettext.h, we can already drop the include of cache.h in these files. On top of that, there were some files using cache.h that didn't need to for any reason. Remove these unnecessary includes.
Signed-off-by Elijah Newren <[email protected]>
--- compat/linux/procinfo.c | 2 +- compat/simple-ipc/ipc-shared.c | 2 +- connected.c | 2 +- grep.c | 2 +- negotiator/default.c | 2 +- negotiator/skipping.c | 2 +- notes-cache.c | 2 +- patch-ids.c | 2 +- reflog.c | 2 +- refs/iterator.c | 2 +- replace-object.c | 2 +- t/helper/test-hash.c | 1 - xdiff-interface.c | 2 +- 13 files changed, 12 insertions(+), 13 deletions(-)
compat/linux/procinfo.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "strbuf.h" #include "strvec.h"
compat/simple-ipc/ipc-shared.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "simple-ipc.h" #include "strbuf.h" #include "pkt-line.h"
connected.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "gettext.h" #include "hex.h" #include "object-store.h"
grep.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" #include "gettext.h" #include "grep.h"
negotiator/default.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "default.h" #include "../commit.h" #include "../fetch-negotiator.h"
negotiator/skipping.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "skipping.h" #include "../commit.h" #include "../fetch-negotiator.h"
notes-cache.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "notes-cache.h" #include "object-store.h" #include "repository.h"
patch-ids.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "diff.h" #include "commit.h" #include "hash-lookup.h"
reflog.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "gettext.h" #include "object-store.h" #include "reflog.h"
refs/iterator.c +1 -1
@@ -3,7 +3,7 @@* documentation about the design and use of reference iterators. */ -#include "cache.h" +#include "git-compat-util.h" #include "refs.h" #include "refs/refs-internal.h" #include "iterator.h"
replace-object.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "gettext.h" #include "hex.h" #include "oidmap.h"
t/helper/test-hash.c +0 -1
@@ -1,5 +1,4 @@#include "test-tool.h" -#include "cache.h" #include "hex.h" int cmd_hash_impl (int ac,const char **av,int algo)
xdiff-interface.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" #include "hex.h" #include "object-store.h"
Signature · 1 line
gitgitgadget
PATCH v2 5/16 environment: move comment_line_char from cache.h
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
This is one step towards making strbuf.c not depend upon cache.h. Additional steps will follow in subsequent commits.
Signed-off-by Elijah Newren <[email protected]>
--- add-patch.c | 1 + builtin/branch.c | 1 + builtin/commit.c | 1 + builtin/merge.c | 1 + builtin/tag.c | 1 + cache.h | 7 ------- commit.c | 1 + environment.h | 7 +++++++ fmt-merge-msg.c | 1 + sequencer.c | 1 + strbuf.c | 1 + trailer.c | 1 + wt-status.c | 1 + 13 files changed, 18 insertions(+), 7 deletions(-)
add-patch.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "add-interactive.h" #include "alloc.h" +#include "environment.h" #include "gettext.h" #include "strbuf.h" #include "run-command.h"
builtin/branch.c +1 -0
@@ -8,6 +8,7 @@#include "cache.h" #include "config.h" #include "color.h" +#include "environment.h" #include "refs.h" #include "commit.h" #include "builtin.h"
builtin/commit.c +1 -0
@@ -12,6 +12,7 @@#include "cache-tree.h" #include "color.h" #include "dir.h" +#include "environment.h" #include "builtin.h" #include "diff.h" #include "diffcore.h"
builtin/merge.c +1 -0
@@ -10,6 +10,7 @@#include "cache.h" #include "alloc.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "parse-options.h"
builtin/tag.c +1 -0
@@ -9,6 +9,7 @@#include "cache.h" #include "config.h" #include "builtin.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "refs.h"
cache.h +0 -7
@@ -959,13 +959,6 @@ extern int sparse_expect_files_outside_of_patterns;*/ int use_optional_locks (void ); -/* -* The character that begins a commented line in user-editable file -* that is subject to stripspace. -*/ -extern char comment_line_char; -extern int auto_comment_line_char; -enum log_refs_config {LOG_REFS_UNSET =-1 ,LOG_REFS_NONE =0 ,
commit.c +1 -0
@@ -2,6 +2,7 @@#include "tag.h" #include "commit.h" #include "commit-graph.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "repository.h"
environment.h +7 -0
@@ -3,6 +3,13 @@#include "strvec.h" +/* +* The character that begins a commented line in user-editable file +* that is subject to stripspace. +*/ +extern char comment_line_char; +extern int auto_comment_line_char; +/* * Wrapper of getenv() that returns a strdup value. This value is kept * in argv to be freed later.
fmt-merge-msg.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "alloc.h" #include "config.h" +#include "environment.h" #include "refs.h" #include "object-store.h" #include "diff.h"
sequencer.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "alloc.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "lockfile.h"
strbuf.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "alloc.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "refs.h"
trailer.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "alloc.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "string-list.h" #include "run-command.h"
wt-status.c +1 -0
@@ -4,6 +4,7 @@#include "dir.h" #include "commit.h" #include "diff.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "revision.h"
Signature · 1 line
gitgitgadget
PATCH v2 6/16 abspath.h: move absolute path functions from cache.h
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
This is another step towards letting us remove the include of cache.h in strbuf.c. It does mean that we also need to add includes of abspath.h in a number of C files.
Signed-off-by Elijah Newren <[email protected]>
--- abspath.c | 4 +++- abspath.h | 33 ++++++++++++++++++++++++++++++ apply.c | 1 + archive.c | 1 + builtin/am.c | 1 + builtin/bugreport.c | 1 + builtin/bundle.c | 1 + builtin/clean.c | 1 + builtin/clone.c | 1 + builtin/config.c | 1 + builtin/credential-cache--daemon.c | 1 + builtin/diagnose.c | 1 + builtin/difftool.c | 1 + builtin/fast-import.c | 1 + builtin/fsmonitor--daemon.c | 1 + builtin/gc.c | 1 + builtin/hash-object.c | 1 + builtin/init-db.c | 1 + builtin/log.c | 1 + builtin/mailinfo.c | 1 + builtin/merge-file.c | 1 + builtin/merge.c | 1 + builtin/multi-pack-index.c | 1 + builtin/mv.c | 1 + builtin/rebase.c | 1 + builtin/receive-pack.c | 1 + builtin/rev-parse.c | 1 + builtin/stash.c | 1 + builtin/submodule--helper.c | 1 + builtin/worktree.c | 1 + cache.h | 27 ------------------------ chdir-notify.c | 1 + compat/disk.h | 1 + compat/mingw.c | 1 + compat/simple-ipc/ipc-win32.c | 1 + config.c | 1 + credential.c | 1 + daemon.c | 1 + diff-no-index.c | 1 + diff.c | 1 + dir.c | 1 + editor.c | 1 + environment.c | 1 + exec-cmd.c | 1 + gettext.c | 1 + lockfile.c | 1 + midx.c | 1 + object-file.c | 1 + parse-options.c | 1 + path.c | 1 + pathspec.c | 1 + remote.c | 1 + repository.c | 1 + rerere.c | 1 + scalar.c | 1 + sequencer.c | 1 + setup.c | 1 + strbuf.c | 1 + submodule.c | 1 + t/helper/test-path-utils.c | 1 + tmp-objdir.c | 1 + trace.c | 1 + trace2/tr2_dst.c | 1 + worktree.c | 1 + wrapper.c | 1 + 65 files changed, 98 insertions(+), 28 deletions(-) create mode 100644 abspath.h
abspath.c +3 -1
@@ -1,4 +1,6 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "abspath.h" +#include "strbuf.h" /* * Do not use this for inspecting *tracked* content. When path is a
abspath.h new file +33 -0
@@ -0,0 +1,33 @@ +#ifndef ABSPATH_H +#define ABSPATH_H + +int is_directory (const char *); +char *strbuf_realpath (struct strbuf *resolved,const char *path, +int die_on_error); +char *strbuf_realpath_forgiving (struct strbuf *resolved,const char *path, +int die_on_error); +char *real_pathdup (const char *path,int die_on_error); +const char *absolute_path (const char *path); +char *absolute_pathdup (const char *path); + +/* +* Concatenate "prefix" (if len is non-zero) and "path", with no +* connecting characters (so "prefix" should end with a "/"). +* Unlike prefix_path, this should be used if the named file does +* not have to interact with index entry; i.e. name of a random file +* on the filesystem. +* +* The return value is always a newly allocated string (even if the +* prefix was empty). +*/ +char *prefix_filename (const char *prefix,const char *path); + +/* Likewise, but path=="-" always yields "-" */ +char *prefix_filename_except_for_dash (const char *prefix,const char *path); + +static inline int is_absolute_path (const char *path) +{ +return is_dir_sep (path[0 ]) ||has_dos_drive_prefix (path); +} + +#endif /* ABSPATH_H */
apply.c +1 -0
@@ -8,6 +8,7 @@*/ #include "cache.h" +#include "abspath.h" #include "alloc.h" #include "config.h" #include "object-store.h"
archive.c +1 -0
@@ -1,4 +1,5 @@#include "git-compat-util.h" +#include "abspath.h" #include "alloc.h" #include "config.h" #include "gettext.h"
builtin/am.c +1 -0
@@ -5,6 +5,7 @@*/ #define USE_THE_INDEX_VARIABLE #include "cache.h" +#include "abspath.h" #include "config.h" #include "builtin.h" #include "exec-cmd.h"
builtin/bugreport.c +1 -0
@@ -1,4 +1,5 @@#include "builtin.h" +#include "abspath.h" #include "gettext.h" #include "parse-options.h" #include "strbuf.h"
builtin/bundle.c +1 -0
@@ -1,4 +1,5 @@#include "builtin.h" +#include "abspath.h" #include "gettext.h" #include "strvec.h" #include "parse-options.h"
builtin/clean.c +1 -0
@@ -8,6 +8,7 @@#define USE_THE_INDEX_VARIABLE #include "builtin.h" +#include "abspath.h" #include "cache.h" #include "config.h" #include "dir.h"
builtin/clone.c +1 -0
@@ -10,6 +10,7 @@#define USE_THE_INDEX_VARIABLE #include "builtin.h" +#include "abspath.h" #include "config.h" #include "gettext.h" #include "hex.h"
builtin/config.c +1 -0
@@ -1,4 +1,5 @@#include "builtin.h" +#include "abspath.h" #include "alloc.h" #include "config.h" #include "color.h"
builtin/credential-cache--daemon.c +1 -0
@@ -1,4 +1,5 @@#include "builtin.h" +#include "abspath.h" #include "alloc.h" #include "gettext.h" #include "parse-options.h"
builtin/diagnose.c +1 -0
@@ -1,4 +1,5 @@#include "builtin.h" +#include "abspath.h" #include "gettext.h" #include "parse-options.h" #include "diagnose.h"
builtin/difftool.c +1 -0
@@ -13,6 +13,7 @@*/ #define USE_THE_INDEX_VARIABLE #include "cache.h" +#include "abspath.h" #include "config.h" #include "builtin.h" #include "run-command.h"
builtin/fast-import.c +1 -0
@@ -1,4 +1,5 @@#include "builtin.h" +#include "abspath.h" #include "cache.h" #include "gettext.h" #include "hex.h"
builtin/fsmonitor--daemon.c +1 -0
@@ -1,4 +1,5 @@#include "builtin.h" +#include "abspath.h" #include "alloc.h" #include "config.h" #include "gettext.h"
builtin/gc.c +1 -0
@@ -11,6 +11,7 @@*/ #include "builtin.h" +#include "abspath.h" #include "hex.h" #include "repository.h" #include "config.h"
builtin/hash-object.c +1 -0
@@ -5,6 +5,7 @@* Copyright (C) Junio C Hamano, 2005 */ #include "builtin.h" +#include "abspath.h" #include "config.h" #include "gettext.h" #include "hex.h"
builtin/init-db.c +1 -0
@@ -4,6 +4,7 @@* Copyright (C) Linus Torvalds, 2005 */ #include "cache.h" +#include "abspath.h" #include "config.h" #include "gettext.h" #include "refs.h"
builtin/log.c +1 -0
@@ -5,6 +5,7 @@* 2006 Junio Hamano */ #include "git-compat-util.h" +#include "abspath.h" #include "alloc.h" #include "config.h" #include "gettext.h"
builtin/mailinfo.c +1 -0
@@ -3,6 +3,7 @@* email to figure out authorship and subject */ #include "cache.h" +#include "abspath.h" #include "builtin.h" #include "gettext.h" #include "utf8.h"
builtin/merge-file.c +1 -0
@@ -1,4 +1,5 @@#include "builtin.h" +#include "abspath.h" #include "cache.h" #include "config.h" #include "gettext.h"
builtin/merge.c +1 -0
@@ -8,6 +8,7 @@#define USE_THE_INDEX_VARIABLE #include "cache.h" +#include "abspath.h" #include "alloc.h" #include "config.h" #include "environment.h"
builtin/multi-pack-index.c +1 -0
@@ -1,4 +1,5 @@#include "builtin.h" +#include "abspath.h" #include "cache.h" #include "config.h" #include "gettext.h"
builtin/mv.c +1 -0
@@ -5,6 +5,7 @@*/ #define USE_THE_INDEX_VARIABLE #include "builtin.h" +#include "abspath.h" #include "alloc.h" #include "config.h" #include "gettext.h"
builtin/rebase.c +1 -0
@@ -6,6 +6,7 @@#define USE_THE_INDEX_VARIABLE #include "builtin.h" +#include "abspath.h" #include "gettext.h" #include "hex.h" #include "run-command.h"
builtin/receive-pack.c +1 -0
@@ -1,4 +1,5 @@#include "builtin.h" +#include "abspath.h" #include "repository.h" #include "config.h" #include "gettext.h"
builtin/rev-parse.c +1 -0
@@ -5,6 +5,7 @@*/ #define USE_THE_INDEX_VARIABLE #include "cache.h" +#include "abspath.h" #include "alloc.h" #include "config.h" #include "commit.h"
builtin/stash.c +1 -0
@@ -1,5 +1,6 @@#define USE_THE_INDEX_VARIABLE #include "builtin.h" +#include "abspath.h" #include "config.h" #include "gettext.h" #include "hex.h"
builtin/submodule--helper.c +1 -0
@@ -1,5 +1,6 @@#define USE_THE_INDEX_VARIABLE #include "builtin.h" +#include "abspath.h" #include "alloc.h" #include "gettext.h" #include "hex.h"
builtin/worktree.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "abspath.h" #include "checkout.h" #include "config.h" #include "builtin.h"
cache.h +0 -27
@@ -598,21 +598,6 @@ const char *setup_git_directory(void);char *prefix_path (const char *prefix,int len,const char *path);char *prefix_path_gently (const char *prefix,int len,int *remaining,const char *path); -/* -* Concatenate "prefix" (if len is non-zero) and "path", with no -* connecting characters (so "prefix" should end with a "/"). -* Unlike prefix_path, this should be used if the named file does -* not have to interact with index entry; i.e. name of a random file -* on the filesystem. -* -* The return value is always a newly allocated string (even if the -* prefix was empty). -*/ -char *prefix_filename (const char *prefix,const char *path); - -/* Likewise, but path=="-" always yields "-" */ -char *prefix_filename_except_for_dash (const char *prefix,const char *path); -int check_filename (const char *prefix,const char *name); void verify_filename(const char *prefix, const char *name,
@@ -1160,18 +1145,6 @@ char *interpolate_path(const char *path, int real_home);/* NEEDSWORK: remove this synonym once in-flight topics have migrated */ #define expand_user_path interpolate_pathconst char *enter_repo (const char *path,int strict); -static inline int is_absolute_path (const char *path) -{ -return is_dir_sep (path[0 ]) ||has_dos_drive_prefix (path); -} -int is_directory (const char *); -char *strbuf_realpath (struct strbuf *resolved,const char *path, -int die_on_error); -char *strbuf_realpath_forgiving (struct strbuf *resolved,const char *path, -int die_on_error); -char *real_pathdup (const char *path,int die_on_error); -const char *absolute_path (const char *path); -char *absolute_pathdup (const char *path);const char *remove_leading_path (const char *in,const char *prefix);const char *relative_path (const char *in,const char *prefix,struct strbuf *sb);int normalize_path_copy_len (char *dst,const char *src,int *prefix_len);
chdir-notify.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "abspath.h" #include "chdir-notify.h" #include "list.h" #include "strbuf.h"
compat/disk.h +1 -0
@@ -2,6 +2,7 @@#define COMPAT_DISK_H #include "git-compat-util.h" +#include "abspath.h" #include "gettext.h" static int get_disk_info (struct strbuf *out)
compat/mingw.c +1 -0
@@ -7,6 +7,7 @@#include "../strbuf.h" #include "../run-command.h" #include "../cache.h" +#include "../abspath.h" #include "../alloc.h" #include "win32/lazyload.h" #include "../config.h"
compat/simple-ipc/ipc-win32.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "abspath.h" #include "gettext.h" #include "simple-ipc.h" #include "strbuf.h"
config.c +1 -0
@@ -6,6 +6,7 @@* */ #include "cache.h" +#include "abspath.h" #include "alloc.h" #include "date.h" #include "branch.h"
credential.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "abspath.h" #include "config.h" #include "credential.h" #include "gettext.h"
daemon.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "abspath.h" #include "alloc.h" #include "config.h" #include "pkt-line.h"
diff-no-index.c +1 -0
@@ -5,6 +5,7 @@*/ #include "cache.h" +#include "abspath.h" #include "color.h" #include "commit.h" #include "blob.h"
diff.c +1 -0
@@ -2,6 +2,7 @@* Copyright (C) 2005 Junio C Hamano */ #include "cache.h" +#include "abspath.h" #include "alloc.h" #include "config.h" #include "gettext.h"
dir.c +1 -0
@@ -6,6 +6,7 @@* Junio Hamano, 2005-2006 */ #include "git-compat-util.h" +#include "abspath.h" #include "alloc.h" #include "config.h" #include "dir.h"
editor.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "abspath.h" #include "config.h" #include "gettext.h" #include "strbuf.h"
environment.c +1 -0
@@ -8,6 +8,7 @@* are. */ #include "cache.h" +#include "abspath.h" #include "branch.h" #include "environment.h" #include "gettext.h"
exec-cmd.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "abspath.h" #include "exec-cmd.h" #include "gettext.h" #include "quote.h"
gettext.c +1 -0
@@ -3,6 +3,7 @@*/ #include "cache.h" +#include "abspath.h" #include "exec-cmd.h" #include "gettext.h" #include "strbuf.h"
lockfile.c +1 -0
@@ -3,6 +3,7 @@*/ #include "cache.h" +#include "abspath.h" #include "gettext.h" #include "lockfile.h"
midx.c +1 -0
@@ -1,4 +1,5 @@#include "git-compat-util.h" +#include "abspath.h" #include "alloc.h" #include "config.h" #include "csum-file.h"
object-file.c +1 -0
@@ -7,6 +7,7 @@* creation etc. */ #include "git-compat-util.h" +#include "abspath.h" #include "alloc.h" #include "config.h" #include "gettext.h"
parse-options.c +1 -0
@@ -1,5 +1,6 @@#include "git-compat-util.h" #include "parse-options.h" +#include "abspath.h" #include "cache.h" #include "config.h" #include "commit.h"
path.c +1 -0
@@ -2,6 +2,7 @@* Utilities for paths and pathnames */ #include "cache.h" +#include "abspath.h" #include "gettext.h" #include "hex.h" #include "repository.h"
pathspec.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "abspath.h" #include "config.h" #include "dir.h" #include "gettext.h"
remote.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "abspath.h" #include "alloc.h" #include "config.h" #include "gettext.h"
repository.c +1 -0
@@ -4,6 +4,7 @@*/ #define USE_THE_INDEX_VARIABLE #include "cache.h" +#include "abspath.h" #include "repository.h" #include "object-store.h" #include "config.h"
rerere.c +1 -0
@@ -1,4 +1,5 @@#include "git-compat-util.h" +#include "abspath.h" #include "alloc.h" #include "config.h" #include "gettext.h"
scalar.c +1 -0
@@ -3,6 +3,7 @@*/ #include "cache.h" +#include "abspath.h" #include "gettext.h" #include "parse-options.h" #include "config.h"
sequencer.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "abspath.h" #include "alloc.h" #include "config.h" #include "environment.h"
setup.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "abspath.h" #include "gettext.h" #include "repository.h" #include "config.h"
strbuf.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "abspath.h" #include "alloc.h" #include "environment.h" #include "gettext.h"
submodule.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "abspath.h" #include "alloc.h" #include "repository.h" #include "config.h"
t/helper/test-path-utils.c +1 -0
@@ -1,5 +1,6 @@#include "test-tool.h" #include "cache.h" +#include "abspath.h" #include "string-list.h" #include "utf8.h"
tmp-objdir.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "tmp-objdir.h" +#include "abspath.h" #include "chdir-notify.h" #include "dir.h" #include "sigchain.h"
trace.c +1 -0
@@ -22,6 +22,7 @@*/ #include "cache.h" +#include "abspath.h" #include "quote.h" struct trace_key trace_default_key = {"GIT_TRACE" ,0 ,0 ,0 };
trace2/tr2_dst.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "abspath.h" #include "sigchain.h" #include "trace2/tr2_dst.h" #include "trace2/tr2_sid.h"
worktree.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "abspath.h" #include "alloc.h" #include "gettext.h" #include "repository.h"
wrapper.c +1 -0
@@ -2,6 +2,7 @@* Various trivial helper wrappers around standard functions */ #include "cache.h" +#include "abspath.h" #include "config.h" #include "gettext.h"
Signature · 1 line
gitgitgadget
PATCH v2 7/16 cache.h: remove expand_user_path()
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
expand_user_path() was renamed to interpolate_path() back in mid-2021, but reinstated with a #define and a NEEDSWORK comment that we would eventually want to get rid of it. Do so now.
Signed-off-by Elijah Newren <[email protected]>
--- cache.h | 2 -- gpg-interface.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)
cache.h +0 -2
@@ -1142,8 +1142,6 @@ enum scld_error safe_create_leading_directories_no_share(char *path);int mkdir_in_gitdir (const char *path);char *interpolate_path (const char *path,int real_home); -/* NEEDSWORK: remove this synonym once in-flight topics have migrated */ -#define expand_user_path interpolate_pathconst char *enter_repo (const char *path,int strict);const char *remove_leading_path (const char *in,const char *prefix);const char *relative_path (const char *in,const char *prefix,struct strbuf *sb);
gpg-interface.c +1 -1
@@ -1049,7 +1049,7 @@ static int sign_buffer_ssh(struct strbuf *buffer, struct strbuf *signature, ssh_signing_key_file =strbuf_detach (&key_file->filename,NULL ); }else {/* We assume a file */ - ssh_signing_key_file =expand_user_path (signing_key,1 ); + ssh_signing_key_file =interpolate_path (signing_key,1 ); } buffer_file =mks_tempfile_t (".git_signing_buffer_tmpXXXXXX" );
Signature · 1 line
gitgitgadget
PATCH v2 8/16 path.h: move function declarations for path.c functions from cache.h
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
Signed-off-by Elijah Newren <[email protected]>
--- cache.h | 59 ------------------------------------------------------ path.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 61 insertions(+), 60 deletions(-)
cache.h +0 -59
@@ -1105,7 +1105,6 @@ enum sharedrepo { PERM_EVERYBODY = 0664 };int git_config_perm (const char *var,const char *value); -int adjust_shared_perm (const char *path);/* * Create the directory containing the named path, using care to be
@@ -1141,54 +1140,6 @@ enum scld_error safe_create_leading_directories_const(const char *path);enum scld_error safe_create_leading_directories_no_share (char *path);int mkdir_in_gitdir (const char *path); -char *interpolate_path (const char *path,int real_home); -const char *enter_repo (const char *path,int strict); -const char *remove_leading_path (const char *in,const char *prefix); -const char *relative_path (const char *in,const char *prefix,struct strbuf *sb); -int normalize_path_copy_len (char *dst,const char *src,int *prefix_len); -int normalize_path_copy (char *dst,const char *src); -int longest_ancestor_length (const char *path,struct string_list *prefixes); -char *strip_path_suffix (const char *path,const char *suffix); -int daemon_avoid_alias (const char *path); - -/* -* These functions match their is_hfs_dotgit() counterparts; see utf8.h for -* details. -*/ -int is_ntfs_dotgit (const char *name); -int is_ntfs_dotgitmodules (const char *name); -int is_ntfs_dotgitignore (const char *name); -int is_ntfs_dotgitattributes (const char *name); -int is_ntfs_dotmailmap (const char *name); - -/* -* Returns true iff "str" could be confused as a command-line option when -* passed to a sub-program like "ssh". Note that this has nothing to do with -* shell-quoting, which should be handled separately; we're assuming here that -* the string makes it verbatim to the sub-program. -*/ -int looks_like_command_line_option (const char *str); - -/** -* Return a newly allocated string with the evaluation of -* "$XDG_CONFIG_HOME/$subdir/$filename" if $XDG_CONFIG_HOME is non-empty, otherwise -* "$HOME/.config/$subdir/$filename". Return NULL upon error. -*/ -char *xdg_config_home_for (const char *subdir,const char *filename); - -/** -* Return a newly allocated string with the evaluation of -* "$XDG_CONFIG_HOME/git/$filename" if $XDG_CONFIG_HOME is non-empty, otherwise -* "$HOME/.config/git/$filename". Return NULL upon error. -*/ -char *xdg_config_home (const char *filename); - -/** -* Return a newly allocated string with the evaluation of -* "$XDG_CACHE_HOME/git/$filename" if $XDG_CACHE_HOME is non-empty, otherwise -* "$HOME/.cache/git/$filename". Return NULL upon error. -*/ -char *xdg_cache_home (const char *filename);int git_open_cloexec (const char *name,int flags);#define git_open (name) git_open_cloexec(name, O_RDONLY)
@@ -1355,8 +1306,6 @@ int repo_interpret_branch_name(struct repository *r,#define interpret_branch_name (str, len, buf, options) \ repo_interpret_branch_name(the_repository, str, len, buf, options) -int validate_headref (const char *ref); -int base_name_compare (const char *name1,size_t len1,int mode1,const char *name2,size_t len2,int mode2); int df_name_compare(const char *name1, size_t len1, int mode1,
@@ -1616,14 +1565,6 @@ void stat_validity_update(struct stat_validity *sv, int fd);int versioncmp (const char *s1,const char *s2); -/* -* Create a directory and (if share is nonzero) adjust its permissions -* according to the shared_repository setting. Only use this for -* directories under $GIT_DIR. Don't use it for working tree -* directories. -*/ -void safe_create_dir (const char *dir,int share); -/* * Should we print an ellipsis after an abbreviated SHA-1 value * when doing diff-raw output or indicating a detached HEAD?
path.h +61 -1
74 lines not on this page · raw message
Signature · 1 line
gitgitgadget
PATCH v2 9/16 wrapper.h: move declarations for wrapper.c functions from cache.h
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
Signed-off-by Elijah Newren <[email protected]>
--- apply.c | 1 + builtin/am.c | 1 + builtin/bisect.c | 1 + builtin/branch.c | 1 + builtin/bugreport.c | 2 +- builtin/config.c | 1 + builtin/credential-cache.c | 1 + builtin/difftool.c | 1 + builtin/fast-import.c | 1 + builtin/fmt-merge-msg.c | 1 + builtin/gc.c | 1 + builtin/get-tar-commit-id.c | 1 + builtin/index-pack.c | 1 + builtin/init-db.c | 1 + builtin/merge.c | 1 + builtin/pack-objects.c | 1 + builtin/rebase.c | 1 + builtin/receive-pack.c | 1 + builtin/rerere.c | 1 + builtin/unpack-file.c | 1 + builtin/worktree.c | 1 + cache.h | 32 ---------------------------- commit-graph.c | 1 + compat/mingw.c | 1 + compat/terminal.c | 1 + config.c | 1 + convert.c | 1 + copy.c | 1 + csum-file.c | 1 + daemon.c | 1 + diff.c | 1 + dir.c | 1 + entry.c | 1 + environment.c | 1 + fetch-pack.c | 1 + gpg-interface.c | 1 + http-backend.c | 1 + imap-send.c | 1 + ll-merge.c | 1 + merge-recursive.c | 1 + notes-merge.c | 1 + object-file.c | 1 + packfile.c | 1 + parallel-checkout.c | 1 + pkt-line.c | 1 + read-cache.c | 1 + rebase-interactive.c | 1 + refs.c | 1 + refs/files-backend.c | 3 ++- rerere.c | 1 + sequencer.c | 1 + server-info.c | 1 + shallow.c | 1 + strbuf.c | 1 + streaming.c | 1 + t/helper/test-delta.c | 1 + t/helper/test-fsmonitor-client.c | 1 + t/helper/test-read-cache.c | 1 + tag.c | 1 + tempfile.c | 1 + trace.c | 1 + transport-helper.c | 1 + transport.c | 1 + usage.c | 1 + worktree.c | 1 + wrapper.c | 1 + wrapper.h | 36 ++++++++++++++++++++++++++++++++ write-or-die.c | 1 + 68 files changed, 103 insertions(+), 34 deletions(-) create mode 100644 wrapper.h
apply.c +1 -0
@@ -26,6 +26,7 @@#include "rerere.h" #include "apply.h" #include "entry.h" +#include "wrapper.h" struct gitdiff_data {struct strbuf *root;
builtin/am.c +1 -0
@@ -38,6 +38,7 @@#include "packfile.h" #include "repository.h" #include "pretty.h" +#include "wrapper.h" /** * Returns the length of the first line of msg.
builtin/bisect.c +1 -0
@@ -11,6 +11,7 @@#include "prompt.h" #include "quote.h" #include "revision.h" +#include "wrapper.h" static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS") static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV")
builtin/branch.c +1 -0
@@ -26,6 +26,7 @@#include "worktree.h" #include "help.h" #include "commit-reach.h" +#include "wrapper.h" static const char *const builtin_branch_usage[] = {N_ ("git branch [<options>] [-r | -a] [--merged] [--no-merged]" ),
builtin/bugreport.c +1 -1
@@ -8,7 +8,7 @@#include "hook.h" #include "hook-list.h" #include "diagnose.h" - +#include "wrapper.h" static void get_system_info (struct strbuf *sys_info) {
builtin/config.c +1 -0
@@ -9,6 +9,7 @@#include "urlmatch.h" #include "quote.h" #include "worktree.h" +#include "wrapper.h" static const char *const builtin_config_usage[] = {N_ ("git config [<options>]" ),
builtin/credential-cache.c +1 -0
@@ -1,6 +1,7 @@#include "builtin.h" #include "gettext.h" #include "parse-options.h" +#include "wrapper.h" #ifndef NO_UNIX_SOCKETS
builtin/difftool.c +1 -0
@@ -27,6 +27,7 @@#include "object-store.h" #include "dir.h" #include "entry.h" +#include "wrapper.h" static int trust_exit_code;
builtin/fast-import.c +1 -0
@@ -23,6 +23,7 @@#include "commit-reach.h" #include "khash.h" #include "date.h" +#include "wrapper.h" #define PACK_ID_BITS 16#define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
builtin/fmt-merge-msg.c +1 -0
@@ -3,6 +3,7 @@#include "fmt-merge-msg.h" #include "gettext.h" #include "parse-options.h" +#include "wrapper.h" static const char *const fmt_merge_msg_usage[] = {N_ ("git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" ),
builtin/gc.c +1 -0
@@ -35,6 +35,7 @@#include "exec-cmd.h" #include "gettext.h" #include "hook.h" +#include "wrapper.h" #define FAILED_RUN "failed to run %s"
builtin/get-tar-commit-id.c +1 -0
@@ -6,6 +6,7 @@#include "tar.h" #include "builtin.h" #include "quote.h" +#include "wrapper.h" static const char builtin_get_tar_commit_id_usage[] ="git get-tar-commit-id" ;
builtin/index-pack.c +1 -0
@@ -19,6 +19,7 @@#include "object-store.h" #include "replace-object.h" #include "promisor-remote.h" +#include "wrapper.h" static const char index_pack_usage[] ="git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--[no-]rev-index] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])" ;
builtin/init-db.c +1 -0
@@ -12,6 +12,7 @@#include "exec-cmd.h" #include "parse-options.h" #include "worktree.h" +#include "wrapper.h" #ifndef DEFAULT_GIT_TEMPLATE_DIR #define DEFAULT_GIT_TEMPLATE_DIR "/usr/share/git-core/templates"
builtin/merge.c +1 -0
@@ -49,6 +49,7 @@#include "commit-reach.h" #include "wt-status.h" #include "commit-graph.h" +#include "wrapper.h" #define DEFAULT_TWOHEAD (1<<0)#define DEFAULT_OCTOPUS (1<<1)
builtin/pack-objects.c +1 -0
@@ -40,6 +40,7 @@#include "shallow.h" #include "promisor-remote.h" #include "pack-mtimes.h" +#include "wrapper.h" /* * Objects we are going to pack are collected in the `to_pack` structure.
builtin/rebase.c +1 -0
@@ -32,6 +32,7 @@#include "rebase-interactive.h" #include "reset.h" #include "hook.h" +#include "wrapper.h" static char const *const builtin_rebase_usage[] = { N_("git rebase [-i] [options] [--exec <cmd>] "
builtin/receive-pack.c +1 -0
@@ -33,6 +33,7 @@#include "commit-reach.h" #include "worktree.h" #include "shallow.h" +#include "wrapper.h" static const char *const receive_pack_usage[] = {N_ ("git receive-pack <git-dir>" ),
builtin/rerere.c +1 -0
@@ -6,6 +6,7 @@#include "parse-options.h" #include "string-list.h" #include "rerere.h" +#include "wrapper.h" #include "xdiff/xdiff.h" #include "xdiff-interface.h" #include "pathspec.h"
builtin/unpack-file.c +1 -0
@@ -2,6 +2,7 @@#include "config.h" #include "hex.h" #include "object-store.h" +#include "wrapper.h" static char *create_temp_file (struct object_id *oid) {
builtin/worktree.c +1 -0
@@ -16,6 +16,7 @@#include "submodule.h" #include "utf8.h" #include "worktree.h" +#include "wrapper.h" #include "quote.h" #define BUILTIN_WORKTREE_ADD_USAGE \
cache.h +0 -32
@@ -1085,10 +1085,6 @@ const char *repo_find_unique_abbrev(struct repository *r, const struct object_idint repo_find_unique_abbrev_r (struct repository *r,char *hex,const struct object_id *oid,int len);#define find_unique_abbrev_r (hex, oid, len) repo_find_unique_abbrev_r(the_repository, hex, oid, len) -/* set default permissions by passing mode arguments to open(2) */ -int git_mkstemps_mode (char *pattern,int suffix_len,int mode); -int git_mkstemp_mode (char *pattern,int mode); -/* * NOTE NOTE NOTE!! *
@@ -1423,31 +1419,6 @@ static inline int batch_fsync_enabled(enum fsync_component component)return (fsync_components & component) && (fsync_method ==FSYNC_METHOD_BATCH ); } -ssize_t read_in_full (int fd,void *buf,size_t count); -ssize_t write_in_full (int fd,const void *buf,size_t count); -ssize_t pread_in_full (int fd,void *buf,size_t count,off_t offset); - -static inline ssize_t write_str_in_full (int fd,const char *str) -{ -return write_in_full (fd, str,strlen (str)); -} - -/** -* Open (and truncate) the file at path, write the contents of buf to it, -* and close it. Dies if any errors are encountered. -*/ -void write_file_buf (const char *path,const char *buf,size_t len); - -/** -* Like write_file_buf(), but format the contents into a buffer first. -* Additionally, write_file() will append a newline if one is not already -* present, making it convenient to write text files: -* -* write_file(path, "counter: %d", ctr); -*/ -__attribute__((format (printf,2 ,3 ))) -void write_file (const char *path,const char *fmt, ...); -/* pager.c */ void setup_pager (void );int pager_in_use (void );
@@ -1571,7 +1542,4 @@ int versioncmp(const char *s1, const char *s2);*/ int print_sha1_ellipsis (void ); -/* Return 1 if the file is empty or does not exists, 0 otherwise. */ -int is_empty_or_missing_file (const char *filename); -#endif /* CACHE_H */
commit-graph.c +1 -0
@@ -22,6 +22,7 @@#include "json-writer.h" #include "trace2.h" #include "chunk-format.h" +#include "wrapper.h" void git_test_write_commit_graph_or_die (void ) {
compat/mingw.c +1 -0
@@ -11,6 +11,7 @@#include "../alloc.h" #include "win32/lazyload.h" #include "../config.h" +#include "../wrapper.h" #include "dir.h" #include "gettext.h" #define SECURITY_WIN32
compat/terminal.c +1 -0
@@ -6,6 +6,7 @@#include "run-command.h" #include "string-list.h" #include "hashmap.h" +#include "wrapper.h" #if defined(HAVE_DEV_TTY ) || defined(GIT_WINDOWS_NATIVE )
config.c +1 -0
@@ -28,6 +28,7 @@#include "replace-object.h" #include "refs.h" #include "worktree.h" +#include "wrapper.h" struct config_source {struct config_source *prev;
convert.c +1 -0
@@ -11,6 +11,7 @@#include "sub-process.h" #include "utf8.h" #include "ll-merge.h" +#include "wrapper.h" /* * convert.c - convert a file when checking it out and checking it in.
copy.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "wrapper.h" int copy_fd (int ifd,int ofd) {
csum-file.c +1 -0
@@ -10,6 +10,7 @@#include "cache.h" #include "progress.h" #include "csum-file.h" +#include "wrapper.h" static void verify_buffer_or_die(struct hashfile *f, const void *buf,
daemon.c +1 -0
@@ -6,6 +6,7 @@#include "run-command.h" #include "strbuf.h" #include "string-list.h" +#include "wrapper.h" #ifdef NO_INITGROUPS #define initgroups (x, y) (0)/* nothing */
diff.c +1 -0
@@ -33,6 +33,7 @@#include "promisor-remote.h" #include "dir.h" #include "strmap.h" +#include "wrapper.h" #ifdef NO_FAST_WORKING_DIRECTORY #define FAST_WORKING_DIRECTORY 0
dir.c +1 -0
@@ -21,6 +21,7 @@#include "ewah/ewok.h" #include "fsmonitor.h" #include "submodule-config.h" +#include "wrapper.h" /* * Tells read_directory_recursive how a file or directory should be treated.
entry.c +1 -0
@@ -10,6 +10,7 @@#include "fsmonitor.h" #include "entry.h" #include "parallel-checkout.h" +#include "wrapper.h" static void create_directories (const char *path,int path_len,const struct checkout *state)
environment.c +1 -0
@@ -23,6 +23,7 @@#include "tmp-objdir.h" #include "chdir-notify.h" #include "shallow.h" +#include "wrapper.h" int trust_executable_bit =1 ;int trust_ctime =1 ;
fetch-pack.c +1 -0
@@ -30,6 +30,7 @@#include "commit-graph.h" #include "sigchain.h" #include "mergesort.h" +#include "wrapper.h" static int transfer_unpack_limit =-1 ;static int fetch_unpack_limit =-1 ;
gpg-interface.c +1 -0
@@ -10,6 +10,7 @@#include "sigchain.h" #include "tempfile.h" #include "alias.h" +#include "wrapper.h" static int git_gpg_config (const char *,const char *,void *);
http-backend.c +1 -0
@@ -16,6 +16,7 @@#include "object-store.h" #include "protocol.h" #include "date.h" +#include "wrapper.h" static const char content_type[] ="Content-Type" ;static const char content_length[] ="Content-Length" ;
imap-send.c +1 -0
@@ -28,6 +28,7 @@#include "gettext.h" #include "run-command.h" #include "parse-options.h" +#include "wrapper.h" #if defined(NO_OPENSSL ) && !defined(HAVE_OPENSSL_CSPRNG )typedef void *SSL ;#endif
ll-merge.c +1 -0
@@ -11,6 +11,7 @@#include "run-command.h" #include "ll-merge.h" #include "quote.h" +#include "wrapper.h" struct ll_merge_driver ;
merge-recursive.c +1 -0
@@ -30,6 +30,7 @@#include "tag.h" #include "tree-walk.h" #include "unpack-trees.h" +#include "wrapper.h" #include "xdiff-interface.h" struct merge_options_internal {
notes-merge.c +1 -0
@@ -15,6 +15,7 @@#include "strbuf.h" #include "notes-utils.h" #include "commit-reach.h" +#include "wrapper.h" struct notes_merge_pair {struct object_id obj, base, local, remote;
object-file.c +1 -0
@@ -38,6 +38,7 @@#include "promisor-remote.h" #include "submodule.h" #include "fsck.h" +#include "wrapper.h" /* The maximum size for an object header. */ #define MAX_HEADER_LEN 32
packfile.c +1 -0
@@ -20,6 +20,7 @@#include "midx.h" #include "commit-graph.h" #include "promisor-remote.h" +#include "wrapper.h" char *odb_pack_name(struct strbuf *buf, const unsigned char *hash,
parallel-checkout.c +1 -0
@@ -12,6 +12,7 @@#include "streaming.h" #include "thread-utils.h" #include "trace2.h" +#include "wrapper.h" struct pc_worker {struct child_process cp;
pkt-line.c +1 -0
@@ -3,6 +3,7 @@#include "gettext.h" #include "hex.h" #include "run-command.h" +#include "wrapper.h" char packet_buffer[LARGE_PACKET_MAX ];static const char *packet_trace_prefix ="git" ;
read-cache.c +1 -0
@@ -32,6 +32,7 @@#include "csum-file.h" #include "promisor-remote.h" #include "hook.h" +#include "wrapper.h" /* Mask for the name length in ce_flags in the on-disk index */
rebase-interactive.c +1 -0
@@ -7,6 +7,7 @@#include "commit-slab.h" #include "config.h" #include "dir.h" +#include "wrapper.h" static const char edit_todo_list_advice[] = N_("You can fix this with 'git rebase --edit-todo' "
refs.c +1 -0
@@ -24,6 +24,7 @@#include "sigchain.h" #include "date.h" #include "commit.h" +#include "wrapper.h" /* * List of all available backends
refs/files-backend.c +2 -1
@@ -13,7 +13,8 @@#include "../object.h" #include "../dir.h" #include "../chdir-notify.h" -#include "worktree.h" +#include "../worktree.h" +#include "../wrapper.h" /* * This backend uses the following flags in `ref_update::flags` for
rerere.c +1 -0
@@ -16,6 +16,7 @@#include "object-store.h" #include "hash-lookup.h" #include "strmap.h" +#include "wrapper.h" #define RESOLVED 0#define PUNTED 1
sequencer.c +1 -0
@@ -41,6 +41,7 @@#include "rebase-interactive.h" #include "reset.h" #include "branch.h" +#include "wrapper.h" #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
server-info.c +1 -0
@@ -10,6 +10,7 @@#include "packfile.h" #include "object-store.h" #include "strbuf.h" +#include "wrapper.h" struct update_info_ctx {FILE *cur_fp;
shallow.c +1 -0
@@ -17,6 +17,7 @@#include "list-objects.h" #include "commit-reach.h" #include "shallow.h" +#include "wrapper.h" void set_alternate_shallow_file (struct repository *r,const char *path,int override) {
strbuf.c +1 -0
@@ -8,6 +8,7 @@#include "string-list.h" #include "utf8.h" #include "date.h" +#include "wrapper.h" int starts_with (const char *str,const char *prefix) {
streaming.c +1 -0
@@ -7,6 +7,7 @@#include "object-store.h" #include "replace-object.h" #include "packfile.h" +#include "wrapper.h" typedef int (*open_istream_fn)(struct git_istream *, struct repository *,
t/helper/test-delta.c +1 -0
@@ -12,6 +12,7 @@#include "git-compat-util.h" #include "delta.h" #include "cache.h" +#include "wrapper.h" static const char usage_str[] ="test-tool delta (-d|-p) <from_file> <data_file> <out_file>" ;
t/helper/test-fsmonitor-client.c +1 -0
@@ -9,6 +9,7 @@#include "fsmonitor-ipc.h" #include "thread-utils.h" #include "trace2.h" +#include "wrapper.h" #ifndef HAVE_FSMONITOR_DAEMON_BACKEND int cmd__fsmonitor_client (int argc,const char **argv)
t/helper/test-read-cache.c +1 -0
@@ -2,6 +2,7 @@#include "test-tool.h" #include "cache.h" #include "config.h" +#include "wrapper.h" int cmd__read_cache (int argc,const char **argv) {
tag.c +1 -0
@@ -8,6 +8,7 @@#include "gpg-interface.h" #include "hex.h" #include "packfile.h" +#include "wrapper.h" const char *tag_type ="tag" ;
tempfile.c +1 -0
@@ -45,6 +45,7 @@#include "cache.h" #include "tempfile.h" #include "sigchain.h" +#include "wrapper.h" static VOLATILE_LIST_HEAD (tempfile_list);
trace.c +1 -0
@@ -24,6 +24,7 @@#include "cache.h" #include "abspath.h" #include "quote.h" +#include "wrapper.h" struct trace_key trace_default_key = {"GIT_TRACE" ,0 ,0 ,0 };struct trace_key trace_perf_key =TRACE_KEY_INIT (PERFORMANCE );
transport-helper.c +1 -0
@@ -16,6 +16,7 @@#include "refspec.h" #include "transport-internal.h" #include "protocol.h" +#include "wrapper.h" static int debug;
transport.c +1 -0
@@ -26,6 +26,7 @@#include "object-store.h" #include "color.h" #include "bundle-uri.h" +#include "wrapper.h" static int transport_use_color =-1 ;static char transport_colors[][COLOR_MAXLEN ] = {
usage.c +1 -0
@@ -5,6 +5,7 @@*/ #include "cache.h" #include "gettext.h" +#include "wrapper.h" static void vreportf (const char *prefix,const char *err,va_list params) {
worktree.c +1 -0
@@ -9,6 +9,7 @@#include "dir.h" #include "wt-status.h" #include "config.h" +#include "wrapper.h" void free_worktrees (struct worktree **worktrees) {
wrapper.c +1 -0
@@ -5,6 +5,7 @@#include "abspath.h" #include "config.h" #include "gettext.h" +#include "wrapper.h" static intmax_t count_fsync_writeout_only;static intmax_t count_fsync_hardware_flush;
wrapper.h new file +36 -0
@@ -0,0 +1,36 @@ +#ifndef WRAPPER_H +#define WRAPPER_H + +/* set default permissions by passing mode arguments to open(2) */ +int git_mkstemps_mode (char *pattern,int suffix_len,int mode); +int git_mkstemp_mode (char *pattern,int mode); + +ssize_t read_in_full (int fd,void *buf,size_t count); +ssize_t write_in_full (int fd,const void *buf,size_t count); +ssize_t pread_in_full (int fd,void *buf,size_t count,off_t offset); + +static inline ssize_t write_str_in_full (int fd,const char *str) +{ +return write_in_full (fd, str,strlen (str)); +} + +/** +* Open (and truncate) the file at path, write the contents of buf to it, +* and close it. Dies if any errors are encountered. +*/ +void write_file_buf (const char *path,const char *buf,size_t len); + +/** +* Like write_file_buf(), but format the contents into a buffer first. +* Additionally, write_file() will append a newline if one is not already +* present, making it convenient to write text files: +* +* write_file(path, "counter: %d", ctr); +*/ +__attribute__((format (printf,2 ,3 ))) +void write_file (const char *path,const char *fmt, ...); + +/* Return 1 if the file is empty or does not exists, 0 otherwise. */ +int is_empty_or_missing_file (const char *filename); + +#endif /* WRAPPER_H */
write-or-die.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "config.h" #include "run-command.h" +#include "wrapper.h" /* * Some cases use stdio, but want to flush after the write
Signature · 1 line
gitgitgadget
PATCH v2 10/16 treewide: remove unnecessary includes of cache.h
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
The last several commits were geared at replacing the include of cache.h in strbuf.c with an include of git-compat-util.h. Unfortunately, I had to drop a patch moving some functions from cache.h to object-name.h, due to excessive conflicts with other in-flight topics.
However, even without that patch, the series of patches so far allows us to modify a number of C files to replace an include of cache.h with git-compat-util.h. Do that to reduce our dependencies.
(If we could have kept our object-name.h patch in this series, it would have also let us reduce the includes in checkout.c and fmt-merge-msg.c in addition to strbuf.c).
Just to ensure that nothing else was bringing in cache.h, all of the affected files have been checked to ensure that
gcc -E -I. $SOURCE_FILE | grep '"cache.h"'
found no hits and that
make DEVELOPER=1 ${OBJECT_FILE_FOR_SOURCE_FILE}successfully compiles without warnings.
Signed-off-by Elijah Newren <[email protected]>
--- compat/terminal.c | 2 +- gpg-interface.c | 2 +- lockfile.c | 2 +- parse-options.c | 1 - t/helper/test-delta.c | 1 - t/helper/test-trace2.c | 2 +- tempfile.c | 3 ++- trace2/tr2_cfg.c | 4 +++- trace2/tr2_cmd_name.c | 3 ++- trace2/tr2_dst.c | 3 ++- trace2/tr2_sid.c | 3 ++- usage.c | 3 ++- 12 files changed, 17 insertions(+), 12 deletions(-)
compat/terminal.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "compat/terminal.h" #include "gettext.h" #include "sigchain.h"
gpg-interface.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "commit.h" #include "config.h" #include "gettext.h"
lockfile.c +1 -1
@@ -2,7 +2,7 @@* Copyright (c) 2005, Junio C Hamano */ -#include "cache.h" +#include "git-compat-util.h" #include "abspath.h" #include "gettext.h" #include "lockfile.h"
parse-options.c +0 -1
@@ -1,7 +1,6 @@#include "git-compat-util.h" #include "parse-options.h" #include "abspath.h" -#include "cache.h" #include "config.h" #include "commit.h" #include "color.h"
t/helper/test-delta.c +0 -1
@@ -11,7 +11,6 @@#include "test-tool.h" #include "git-compat-util.h" #include "delta.h" -#include "cache.h" #include "wrapper.h" static const char usage_str[] =
t/helper/test-trace2.c +1 -1
@@ -1,9 +1,9 @@#include "test-tool.h" -#include "cache.h" #include "strvec.h" #include "run-command.h" #include "exec-cmd.h" #include "config.h" +#include "trace2.h" typedef int (fn_unit_test )(int argc,const char **argv);
tempfile.c +2 -1
@@ -42,7 +42,8 @@* file created by its parent. */ -#include "cache.h" +#include "git-compat-util.h" +#include "path.h" #include "tempfile.h" #include "sigchain.h" #include "wrapper.h"
trace2/tr2_cfg.c +3 -1
@@ -1,5 +1,7 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" +#include "strbuf.h" +#include "trace2.h" #include "trace2/tr2_cfg.h" #include "trace2/tr2_sysenv.h"
trace2/tr2_cmd_name.c +2 -1
@@ -1,4 +1,5 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "strbuf.h" #include "trace2/tr2_cmd_name.h" #define TR2_ENVVAR_PARENT_NAME "GIT_TRACE2_PARENT_NAME"
trace2/tr2_dst.c +2 -1
@@ -1,6 +1,7 @@ -#include "cache.h" +#include "git-compat-util.h" #include "abspath.h" #include "sigchain.h" +#include "strbuf.h" #include "trace2/tr2_dst.h" #include "trace2/tr2_sid.h" #include "trace2/tr2_sysenv.h"
trace2/tr2_sid.c +2 -1
@@ -1,5 +1,6 @@ -#include "cache.h" +#include "git-compat-util.h" #include "hex.h" +#include "strbuf.h" #include "trace2/tr2_tbuf.h" #include "trace2/tr2_sid.h"
usage.c +2 -1
@@ -3,8 +3,9 @@* * Copyright (C) Linus Torvalds, 2005 */ -#include "cache.h" +#include "git-compat-util.h" #include "gettext.h" +#include "trace2.h" #include "wrapper.h" static void vreportf (const char *prefix,const char *err,va_list params)
Signature · 1 line
gitgitgadget
PATCH v2 11/16 environment.h: move declarations for environment.c functions from cache.h
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
Signed-off-by Elijah Newren <[email protected]>
--- apply.c | 1 + archive.c | 1 + attr.c | 1 + bisect.c | 1 + branch.c | 1 + builtin/am.c | 1 + builtin/bisect.c | 1 + builtin/blame.c | 1 + builtin/cat-file.c | 1 + builtin/check-attr.c | 1 + builtin/checkout.c | 1 + builtin/clone.c | 1 + builtin/commit-graph.c | 1 + builtin/config.c | 1 + builtin/count-objects.c | 1 + builtin/describe.c | 1 + builtin/difftool.c | 1 + builtin/fast-import.c | 1 + builtin/fetch.c | 1 + builtin/fsmonitor--daemon.c | 1 + builtin/gc.c | 1 + builtin/index-pack.c | 1 + builtin/init-db.c | 1 + builtin/log.c | 1 + builtin/mailinfo.c | 1 + builtin/multi-pack-index.c | 1 + builtin/mv.c | 1 + builtin/name-rev.c | 1 + builtin/pack-objects.c | 1 + builtin/prune.c | 1 + builtin/push.c | 1 + builtin/rebase.c | 1 + builtin/receive-pack.c | 1 + builtin/repack.c | 1 + builtin/replace.c | 1 + builtin/reset.c | 1 + builtin/rev-list.c | 1 + builtin/rev-parse.c | 1 + builtin/shortlog.c | 1 + builtin/show-branch.c | 1 + builtin/sparse-checkout.c | 1 + builtin/stash.c | 1 + builtin/submodule--helper.c | 1 + builtin/unpack-objects.c | 1 + builtin/update-index.c | 1 + builtin/worktree.c | 1 + builtin/write-tree.c | 1 + bulk-checkin.c | 1 + bundle-uri.c | 1 + bundle.c | 1 + cache-tree.c | 1 + cache.h | 207 --------------------------- combine-diff.c | 1 + compat/mingw.c | 1 + compat/precompose_utf8.c | 1 + connect.c | 1 + daemon.c | 1 + diff.c | 1 + dir.c | 1 + editor.c | 1 + entry.c | 1 + environment.h | 213 ++++++++++++++++++++++++++++ exec-cmd.c | 1 + fetch-pack.c | 1 + fsmonitor.c | 1 + gettext.c | 1 + git.c | 1 + http-backend.c | 1 + http-push.c | 1 + log-tree.c | 1 + ls-refs.c | 1 + mailmap.c | 1 + merge-ort.c | 1 + merge-recursive.c | 1 + name-hash.c | 1 + notes-utils.c | 1 + notes.c | 1 + object-file.c | 1 + object-name.c | 1 + pack-bitmap-write.c | 1 + pack-check.c | 1 + pack-write.c | 1 + packfile.c | 1 + parse-options-cb.c | 1 + path.c | 1 + pathspec.c | 1 + preload-index.c | 1 + pretty.c | 1 + prompt.c | 1 + protocol.c | 1 + prune-packed.c | 1 + range-diff.c | 1 + read-cache.c | 1 + rebase-interactive.c | 1 + ref-filter.c | 1 + refs.c | 1 + refs/files-backend.c | 1 + remote-curl.c | 1 + remote.c | 1 + revision.c | 1 + run-command.c | 1 + server-info.c | 1 + setup.c | 1 + sparse-index.c | 1 + streaming.c | 1 + submodule-config.c | 1 + submodule.c | 1 + t/helper/test-fast-rebase.c | 1 + t/helper/test-lazy-init-name-hash.c | 1 + t/helper/test-path-utils.c | 1 + t/helper/test-repository.c | 1 + tag.c | 1 + tmp-objdir.c | 1 + trace.c | 1 + transport-helper.c | 1 + transport.c | 1 + unpack-trees.c | 1 + upload-pack.c | 1 + worktree.c | 1 + 119 files changed, 330 insertions(+), 207 deletions(-)
apply.c +1 -0
@@ -16,6 +16,7 @@#include "delta.h" #include "diff.h" #include "dir.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "xdiff-interface.h"
archive.c +1 -0
@@ -2,6 +2,7 @@#include "abspath.h" #include "alloc.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "refs.h"
attr.c +1 -0
@@ -9,6 +9,7 @@#include "cache.h" #include "alloc.h" #include "config.h" +#include "environment.h" #include "exec-cmd.h" #include "attr.h" #include "dir.h"
bisect.c +1 -0
@@ -2,6 +2,7 @@#include "config.h" #include "commit.h" #include "diff.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "revision.h"
branch.c +1 -0
@@ -2,6 +2,7 @@#include "cache.h" #include "config.h" #include "branch.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "refs.h"
builtin/am.c +1 -0
@@ -8,6 +8,7 @@#include "abspath.h" #include "config.h" #include "builtin.h" +#include "environment.h" #include "exec-cmd.h" #include "gettext.h" #include "hex.h"
builtin/bisect.c +1 -0
@@ -1,5 +1,6 @@#include "builtin.h" #include "cache.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "parse-options.h"
builtin/blame.c +1 -0
@@ -10,6 +10,7 @@#include "config.h" #include "color.h" #include "builtin.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "repository.h"
builtin/cat-file.c +1 -0
@@ -9,6 +9,7 @@#include "config.h" #include "builtin.h" #include "diff.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "ident.h"
builtin/check-attr.c +1 -0
@@ -3,6 +3,7 @@#include "cache.h" #include "config.h" #include "attr.h" +#include "environment.h" #include "gettext.h" #include "quote.h" #include "parse-options.h"
builtin/checkout.c +1 -0
@@ -9,6 +9,7 @@#include "config.h" #include "diff.h" #include "dir.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "hook.h"
builtin/clone.c +1 -0
@@ -12,6 +12,7 @@#include "builtin.h" #include "abspath.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "lockfile.h"
builtin/commit-graph.c +1 -0
@@ -1,6 +1,7 @@#include "builtin.h" #include "config.h" #include "dir.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "lockfile.h"
builtin/config.c +1 -0
@@ -3,6 +3,7 @@#include "alloc.h" #include "config.h" #include "color.h" +#include "environment.h" #include "gettext.h" #include "ident.h" #include "parse-options.h"
builtin/count-objects.c +1 -0
@@ -7,6 +7,7 @@#include "cache.h" #include "config.h" #include "dir.h" +#include "environment.h" #include "gettext.h" #include "repository.h" #include "builtin.h"
builtin/describe.c +1 -0
@@ -1,6 +1,7 @@#define USE_THE_INDEX_VARIABLE #include "cache.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "lockfile.h"
builtin/difftool.c +1 -0
@@ -17,6 +17,7 @@#include "config.h" #include "builtin.h" #include "run-command.h" +#include "environment.h" #include "exec-cmd.h" #include "gettext.h" #include "hex.h"
builtin/fast-import.c +1 -0
@@ -1,6 +1,7 @@#include "builtin.h" #include "abspath.h" #include "cache.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "repository.h"
builtin/fetch.c +1 -0
@@ -4,6 +4,7 @@#include "cache.h" #include "config.h" #include "gettext.h" +#include "environment.h" #include "hex.h" #include "repository.h" #include "refs.h"
builtin/fsmonitor--daemon.c +1 -0
@@ -2,6 +2,7 @@#include "abspath.h" #include "alloc.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "parse-options.h" #include "fsmonitor.h"
builtin/gc.c +1 -0
@@ -12,6 +12,7 @@#include "builtin.h" #include "abspath.h" +#include "environment.h" #include "hex.h" #include "repository.h" #include "config.h"
builtin/index-pack.c +1 -0
@@ -2,6 +2,7 @@#include "alloc.h" #include "config.h" #include "delta.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "pack.h"
builtin/init-db.c +1 -0
@@ -6,6 +6,7 @@#include "cache.h" #include "abspath.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "refs.h" #include "builtin.h"
builtin/log.c +1 -0
@@ -8,6 +8,7 @@#include "abspath.h" #include "alloc.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "refs.h"
builtin/mailinfo.c +1 -0
@@ -5,6 +5,7 @@#include "cache.h" #include "abspath.h" #include "builtin.h" +#include "environment.h" #include "gettext.h" #include "utf8.h" #include "strbuf.h"
builtin/multi-pack-index.c +1 -0
@@ -2,6 +2,7 @@#include "abspath.h" #include "cache.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "parse-options.h" #include "midx.h"
builtin/mv.c +1 -0
@@ -8,6 +8,7 @@#include "abspath.h" #include "alloc.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "pathspec.h" #include "lockfile.h"
builtin/name-rev.c +1 -0
@@ -1,5 +1,6 @@#include "builtin.h" #include "alloc.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "repository.h"
builtin/pack-objects.c +1 -0
@@ -1,5 +1,6 @@#include "builtin.h" #include "alloc.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "repository.h"
builtin/prune.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "commit.h" #include "diff.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "revision.h"
builtin/push.c +1 -0
@@ -4,6 +4,7 @@#include "cache.h" #include "branch.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "refs.h" #include "refspec.h"
builtin/rebase.c +1 -0
@@ -7,6 +7,7 @@#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "abspath.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "run-command.h"
builtin/receive-pack.c +1 -0
@@ -2,6 +2,7 @@#include "abspath.h" #include "repository.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "lockfile.h"
builtin/repack.c +1 -0
@@ -2,6 +2,7 @@#include "alloc.h" #include "config.h" #include "dir.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "parse-options.h"
builtin/replace.c +1 -0
@@ -11,6 +11,7 @@#include "cache.h" #include "config.h" #include "builtin.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "refs.h"
builtin/reset.c +1 -0
@@ -10,6 +10,7 @@#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "lockfile.h"
builtin/rev-list.c +1 -0
@@ -2,6 +2,7 @@#include "config.h" #include "commit.h" #include "diff.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "revision.h"
builtin/rev-parse.c +1 -0
@@ -9,6 +9,7 @@#include "alloc.h" #include "config.h" #include "commit.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "refs.h"
builtin/shortlog.c +1 -0
@@ -3,6 +3,7 @@#include "config.h" #include "commit.h" #include "diff.h" +#include "environment.h" #include "gettext.h" #include "string-list.h" #include "revision.h"
builtin/show-branch.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "pretty.h"
builtin/sparse-checkout.c +1 -0
@@ -2,6 +2,7 @@#include "cache.h" #include "config.h" #include "dir.h" +#include "environment.h" #include "gettext.h" #include "parse-options.h" #include "pathspec.h"
builtin/stash.c +1 -0
@@ -2,6 +2,7 @@#include "builtin.h" #include "abspath.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "parse-options.h"
builtin/submodule--helper.c +1 -0
@@ -2,6 +2,7 @@#include "builtin.h" #include "abspath.h" #include "alloc.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "repository.h"
builtin/unpack-objects.c +1 -0
@@ -2,6 +2,7 @@#include "cache.h" #include "bulk-checkin.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "object-store.h"
builtin/update-index.c +1 -0
@@ -7,6 +7,7 @@#include "cache.h" #include "bulk-checkin.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "lockfile.h"
builtin/worktree.c +1 -0
@@ -4,6 +4,7 @@#include "config.h" #include "builtin.h" #include "dir.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "parse-options.h"
builtin/write-tree.c +1 -0
@@ -7,6 +7,7 @@#include "builtin.h" #include "cache.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "tree.h"
bulk-checkin.c +1 -0
@@ -4,6 +4,7 @@#include "git-compat-util.h" #include "alloc.h" #include "bulk-checkin.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "lockfile.h"
bundle-uri.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "bundle-uri.h" #include "bundle.h" +#include "environment.h" #include "gettext.h" #include "object-store.h" #include "refs.h"
bundle.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "lockfile.h" #include "bundle.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "object-store.h"
cache-tree.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "alloc.h" +#include "environment.h" #include "hex.h" #include "lockfile.h" #include "tree.h"
cache.h +0 -207
264 lines not on this page · raw message
combine-diff.c +1 -0
@@ -4,6 +4,7 @@#include "blob.h" #include "diff.h" #include "diffcore.h" +#include "environment.h" #include "hex.h" #include "quote.h" #include "xdiff-interface.h"
compat/mingw.c +1 -0
@@ -11,6 +11,7 @@#include "../alloc.h" #include "win32/lazyload.h" #include "../config.h" +#include "../environment.h" #include "../wrapper.h" #include "dir.h" #include "gettext.h"
compat/precompose_utf8.c +1 -0
@@ -7,6 +7,7 @@#include "cache.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "utf8.h" #include "precompose_utf8.h"
connect.c +1 -0
@@ -1,6 +1,7 @@#include "git-compat-util.h" #include "cache.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "pkt-line.h"
daemon.c +1 -0
@@ -2,6 +2,7 @@#include "abspath.h" #include "alloc.h" #include "config.h" +#include "environment.h" #include "pkt-line.h" #include "run-command.h" #include "strbuf.h"
diff.c +1 -0
@@ -5,6 +5,7 @@#include "abspath.h" #include "alloc.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "tempfile.h" #include "quote.h"
dir.c +1 -0
@@ -10,6 +10,7 @@#include "alloc.h" #include "config.h" #include "dir.h" +#include "environment.h" #include "gettext.h" #include "object-store.h" #include "attr.h"
editor.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "abspath.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "strbuf.h" #include "strvec.h"
entry.c +1 -0
@@ -2,6 +2,7 @@#include "blob.h" #include "object-store.h" #include "dir.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "streaming.h"
environment.h +213 -0
223 lines not on this page · raw message
exec-cmd.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "abspath.h" +#include "environment.h" #include "exec-cmd.h" #include "gettext.h" #include "quote.h"
fetch-pack.c +1 -0
@@ -2,6 +2,7 @@#include "alloc.h" #include "repository.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "lockfile.h"
fsmonitor.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "config.h" #include "dir.h" +#include "environment.h" #include "ewah/ewok.h" #include "fsmonitor.h" #include "fsmonitor-ipc.h"
gettext.c +1 -0
@@ -4,6 +4,7 @@#include "cache.h" #include "abspath.h" +#include "environment.h" #include "exec-cmd.h" #include "gettext.h" #include "strbuf.h"
git.c +1 -0
@@ -1,5 +1,6 @@#include "builtin.h" #include "config.h" +#include "environment.h" #include "exec-cmd.h" #include "gettext.h" #include "help.h"
http-backend.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "alloc.h" #include "config.h" +#include "environment.h" #include "hex.h" #include "repository.h" #include "refs.h"
http-push.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "environment.h" #include "hex.h" #include "repository.h" #include "commit.h"
log-tree.c +1 -0
@@ -2,6 +2,7 @@#include "commit-reach.h" #include "config.h" #include "diff.h" +#include "environment.h" #include "hex.h" #include "object-store.h" #include "repository.h"
ls-refs.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "repository.h"
mailmap.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "environment.h" #include "string-list.h" #include "mailmap.h" #include "object-store.h"
merge-ort.c +1 -0
@@ -26,6 +26,7 @@#include "diff.h" #include "diffcore.h" #include "dir.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "entry.h"
merge-recursive.c +1 -0
@@ -17,6 +17,7 @@#include "diff.h" #include "diffcore.h" #include "dir.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "ll-merge.h"
name-hash.c +1 -0
@@ -6,6 +6,7 @@* Copyright (C) 2008 Linus Torvalds */ #include "cache.h" +#include "environment.h" #include "gettext.h" #include "thread-utils.h" #include "trace2.h"
notes-utils.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "config.h" #include "commit.h" +#include "environment.h" #include "gettext.h" #include "refs.h" #include "notes-utils.h"
notes.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "config.h" +#include "environment.h" #include "hex.h" #include "notes.h" #include "object-store.h"
object-file.c +1 -0
@@ -10,6 +10,7 @@#include "abspath.h" #include "alloc.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "string-list.h"
object-name.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "tag.h"
pack-bitmap-write.c +1 -0
@@ -1,5 +1,6 @@#include "git-compat-util.h" #include "alloc.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "object-store.h"
pack-check.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "environment.h" #include "hex.h" #include "repository.h" #include "pack.h"
pack-write.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "pack.h"
packfile.c +1 -0
@@ -1,5 +1,6 @@#include "git-compat-util.h" #include "alloc.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "list.h"
parse-options-cb.c +1 -0
@@ -4,6 +4,7 @@#include "cache.h" #include "commit.h" #include "color.h" +#include "environment.h" #include "gettext.h" #include "string-list.h" #include "strvec.h"
path.c +1 -0
@@ -3,6 +3,7 @@*/ #include "cache.h" #include "abspath.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "repository.h"
pathspec.c +1 -0
@@ -2,6 +2,7 @@#include "abspath.h" #include "config.h" #include "dir.h" +#include "environment.h" #include "gettext.h" #include "pathspec.h" #include "attr.h"
preload-index.c +1 -0
@@ -4,6 +4,7 @@#include "cache.h" #include "pathspec.h" #include "dir.h" +#include "environment.h" #include "fsmonitor.h" #include "gettext.h" #include "config.h"
pretty.c +1 -0
@@ -2,6 +2,7 @@#include "alloc.h" #include "config.h" #include "commit.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "utf8.h"
prompt.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "config.h" +#include "environment.h" #include "run-command.h" #include "strbuf.h" #include "prompt.h"
protocol.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "config.h" +#include "environment.h" #include "protocol.h" static enum protocol_version parse_protocol_version (const char *value)
prune-packed.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "environment.h" #include "gettext.h" #include "object-store.h" #include "packfile.h"
range-diff.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "environment.h" #include "gettext.h" #include "range-diff.h" #include "string-list.h"
read-cache.c +1 -0
@@ -18,6 +18,7 @@#include "tree.h" #include "commit.h" #include "blob.h" +#include "environment.h" #include "gettext.h" #include "resolve-undo.h" #include "run-command.h"
rebase-interactive.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "commit.h" +#include "environment.h" #include "gettext.h" #include "sequencer.h" #include "rebase-interactive.h"
ref-filter.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "alloc.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "parse-options.h"
refs.c +1 -0
@@ -5,6 +5,7 @@#include "cache.h" #include "alloc.h" #include "config.h" +#include "environment.h" #include "hashmap.h" #include "gettext.h" #include "hex.h"
refs/files-backend.c +1 -0
@@ -1,5 +1,6 @@#include "../cache.h" #include "../config.h" +#include "../environment.h" #include "../gettext.h" #include "../hex.h" #include "../refs.h"
remote-curl.c +1 -0
@@ -1,6 +1,7 @@#include "git-compat-util.h" #include "alloc.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "remote.h"
remote.c +1 -0
@@ -2,6 +2,7 @@#include "abspath.h" #include "alloc.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "remote.h"
revision.c +1 -0
@@ -1,6 +1,7 @@#include "git-compat-util.h" #include "alloc.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "object-store.h"
run-command.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "run-command.h" +#include "environment.h" #include "exec-cmd.h" #include "gettext.h" #include "sigchain.h"
server-info.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "alloc.h" #include "dir.h" +#include "environment.h" #include "hex.h" #include "repository.h" #include "refs.h"
setup.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "abspath.h" +#include "environment.h" #include "gettext.h" #include "repository.h" #include "config.h"
sparse-index.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "alloc.h" +#include "environment.h" #include "gettext.h" #include "repository.h" #include "sparse-index.h"
streaming.c +1 -0
@@ -2,6 +2,7 @@* Copyright (c) 2011, Google Inc. */ #include "cache.h" +#include "environment.h" #include "streaming.h" #include "repository.h" #include "object-store.h"
submodule-config.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "alloc.h" #include "dir.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "repository.h"
submodule.c +1 -0
@@ -8,6 +8,7 @@#include "dir.h" #include "diff.h" #include "commit.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "revision.h"
t/helper/test-fast-rebase.c +1 -0
@@ -15,6 +15,7 @@#include "cache.h" #include "cache-tree.h" #include "commit.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "lockfile.h"
t/helper/test-lazy-init-name-hash.c +1 -0
@@ -1,6 +1,7 @@#define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "cache.h" +#include "environment.h" #include "parse-options.h" static int single;
t/helper/test-path-utils.c +1 -0
@@ -1,6 +1,7 @@#include "test-tool.h" #include "cache.h" #include "abspath.h" +#include "environment.h" #include "string-list.h" #include "utf8.h"
t/helper/test-repository.c +1 -0
@@ -3,6 +3,7 @@#include "commit-graph.h" #include "commit.h" #include "config.h" +#include "environment.h" #include "hex.h" #include "object-store.h" #include "object.h"
tag.c +1 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "environment.h" #include "tag.h" #include "object-store.h" #include "commit.h"
tmp-objdir.c +1 -0
@@ -3,6 +3,7 @@#include "abspath.h" #include "chdir-notify.h" #include "dir.h" +#include "environment.h" #include "sigchain.h" #include "string-list.h" #include "strbuf.h"
trace.c +1 -0
@@ -23,6 +23,7 @@#include "cache.h" #include "abspath.h" +#include "environment.h" #include "quote.h" #include "wrapper.h"
transport-helper.c +1 -0
@@ -4,6 +4,7 @@#include "run-command.h" #include "commit.h" #include "diff.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "revision.h"
transport.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "alloc.h" #include "config.h" +#include "environment.h" #include "hex.h" #include "transport.h" #include "hook.h"
unpack-trees.c +1 -0
@@ -3,6 +3,7 @@#include "repository.h" #include "config.h" #include "dir.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "tree.h"
upload-pack.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "config.h" +#include "environment.h" #include "gettext.h" #include "hex.h" #include "refs.h"
worktree.c +1 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "abspath.h" #include "alloc.h" +#include "environment.h" #include "gettext.h" #include "repository.h" #include "refs.h"
Signature · 1 line
gitgitgadget
PATCH v2 12/16 treewide: remove cache.h inclusion due to environment.h changes
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
Signed-off-by Elijah Newren <[email protected]>
--- csum-file.c | 2 +- gettext.c | 2 +- ls-refs.c | 2 +- notes-utils.c | 2 +- prompt.c | 2 +- prune-packed.c | 2 +- reachable.c | 2 +- t/helper/test-bitmap.c | 2 +- trailer.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-)
csum-file.c +1 -1
@@ -7,7 +7,7 @@* files. Useful when you write a file that you want to be * able to verify hasn't been messed with afterwards. */ -#include "cache.h" +#include "git-compat-util.h" #include "progress.h" #include "csum-file.h" #include "wrapper.h"
gettext.c +1 -1
@@ -2,7 +2,7 @@* Copyright (c) 2010 Ævar Arnfjörð Bjarmason */ -#include "cache.h" +#include "git-compat-util.h" #include "abspath.h" #include "environment.h" #include "exec-cmd.h"
ls-refs.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "environment.h" #include "gettext.h" #include "hex.h"
notes-utils.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" #include "commit.h" #include "environment.h"
prompt.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" #include "environment.h" #include "run-command.h"
prune-packed.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "environment.h" #include "gettext.h" #include "object-store.h"
reachable.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "gettext.h" #include "hex.h" #include "refs.h"
t/helper/test-bitmap.c +1 -1
@@ -1,5 +1,5 @@#include "test-tool.h" -#include "cache.h" +#include "git-compat-util.h" #include "pack-bitmap.h" static int bitmap_list_commits (void )
trailer.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "alloc.h" #include "config.h" #include "environment.h"
Signature · 1 line
gitgitgadget
PATCH v2 13/16 setup.h: move declarations for setup.c functions from cache.h
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
Signed-off-by Elijah Newren <[email protected]>
--- apply.c | 1 + archive.c | 1 + attr.c | 1 + blame.c | 1 + builtin/blame.c | 1 + builtin/bugreport.c | 1 + builtin/bundle.c | 1 + builtin/check-attr.c | 1 + builtin/check-ref-format.c | 1 + builtin/checkout-index.c | 1 + builtin/checkout.c | 1 + builtin/clean.c | 1 + builtin/clone.c | 1 + builtin/config.c | 1 + builtin/describe.c | 1 + builtin/diff-index.c | 1 + builtin/diff.c | 1 + builtin/difftool.c | 1 + builtin/gc.c | 1 + builtin/grep.c | 1 + builtin/hash-object.c | 1 + builtin/help.c | 1 + builtin/index-pack.c | 1 + builtin/init-db.c | 1 + builtin/ls-files.c | 1 + builtin/merge-file.c | 1 + builtin/mv.c | 1 + builtin/read-tree.c | 1 + builtin/reset.c | 1 + builtin/rev-parse.c | 1 + builtin/rm.c | 1 + builtin/shortlog.c | 1 + builtin/sparse-checkout.c | 1 + builtin/stash.c | 1 + builtin/stripspace.c | 1 + builtin/submodule--helper.c | 1 + builtin/update-index.c | 1 + cache.h | 163 ------------------ commit.c | 1 + common-main.c | 1 + config.c | 1 + daemon.c | 1 + diff.c | 1 + dir.c | 1 + environment.c | 1 + git.c | 1 + http-fetch.c | 1 + http-push.c | 1 + imap-send.c | 1 + line-log.c | 1 + mailmap.c | 1 + object-file.c | 1 + object-name.c | 1 + path.c | 1 + pathspec.c | 1 + refs.c | 1 + refs/files-backend.c | 1 + remote-curl.c | 1 + remote.c | 1 + repository.c | 1 + revision.c | 1 + scalar.c | 1 + setup.c | 1 + setup.h | 168 +++++++++++++++++++ submodule.c | 1 + symlinks.c | 1 + t/helper/test-advise.c | 1 + t/helper/test-bitmap.c | 1 + t/helper/test-bloom.c | 1 + t/helper/test-cache-tree.c | 1 + t/helper/test-config.c | 1 + t/helper/test-dump-cache-tree.c | 2 +- t/helper/test-dump-fsmonitor.c | 1 + t/helper/test-dump-split-index.c | 1 + t/helper/test-dump-untracked-cache.c | 1 + t/helper/test-fast-rebase.c | 1 + t/helper/test-fsmonitor-client.c | 1 + t/helper/test-lazy-init-name-hash.c | 1 + t/helper/test-match-trees.c | 1 + t/helper/test-oid-array.c | 1 + t/helper/test-oidmap.c | 1 + t/helper/test-oidtree.c | 1 + t/helper/test-pack-mtimes.c | 1 + t/helper/test-partial-clone.c | 1 + t/helper/test-path-utils.c | 1 + t/helper/test-proc-receive.c | 1 + t/helper/test-reach.c | 1 + t/helper/test-read-cache.c | 1 + t/helper/test-read-graph.c | 1 + t/helper/test-read-midx.c | 1 + t/helper/test-ref-store.c | 1 + t/helper/test-repository.c | 1 + t/helper/test-revision-walking.c | 1 + t/helper/test-scrap-cache-tree.c | 1 + t/helper/test-serve-v2.c | 1 + t/helper/test-submodule-config.c | 1 + t/helper/test-submodule-nested-repo-config.c | 1 + t/helper/test-submodule.c | 1 + t/helper/test-subprocess.c | 1 + t/helper/test-userdiff.c | 1 + t/helper/test-write-cache.c | 1 + trace.c | 1 + unpack-trees.c | 1 + worktree.c | 1 + wt-status.c | 1 + 105 files changed, 271 insertions(+), 164 deletions(-) create mode 100644 setup.h
apply.c +1 -0
@@ -27,6 +27,7 @@#include "rerere.h" #include "apply.h" #include "entry.h" +#include "setup.h" #include "wrapper.h" struct gitdiff_data {
archive.c +1 -0
@@ -5,6 +5,7 @@#include "environment.h" #include "gettext.h" #include "hex.h" +#include "setup.h" #include "refs.h" #include "object-store.h" #include "commit.h"
attr.c +1 -0
@@ -18,6 +18,7 @@#include "quote.h" #include "revision.h" #include "object-store.h" +#include "setup.h" #include "thread-utils.h" const char git_attr__true[] ="(builtin)true" ;
blame.c +1 -0
@@ -7,6 +7,7 @@#include "diffcore.h" #include "gettext.h" #include "hex.h" +#include "setup.h" #include "tag.h" #include "blame.h" #include "alloc.h"
builtin/blame.c +1 -0
@@ -31,6 +31,7 @@#include "object-store.h" #include "blame.h" #include "refs.h" +#include "setup.h" #include "tag.h" static char blame_usage[] =N_ ("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" );
builtin/bugreport.c +1 -0
@@ -8,6 +8,7 @@#include "hook.h" #include "hook-list.h" #include "diagnose.h" +#include "setup.h" #include "wrapper.h" static void get_system_info (struct strbuf *sys_info)
builtin/bundle.c +1 -0
@@ -1,6 +1,7 @@#include "builtin.h" #include "abspath.h" #include "gettext.h" +#include "setup.h" #include "strvec.h" #include "parse-options.h" #include "cache.h"
builtin/check-attr.c +1 -0
@@ -6,6 +6,7 @@#include "environment.h" #include "gettext.h" #include "quote.h" +#include "setup.h" #include "parse-options.h" static int all_attrs;
builtin/check-ref-format.c +1 -0
@@ -5,6 +5,7 @@#include "cache.h" #include "refs.h" #include "builtin.h" +#include "setup.h" #include "strbuf.h" static const char builtin_check_ref_format_usage[] =
builtin/checkout-index.c +1 -0
@@ -15,6 +15,7 @@#include "parse-options.h" #include "entry.h" #include "parallel-checkout.h" +#include "setup.h" #define CHECKOUT_ALL 4static int nul_term_line;
builtin/checkout.c +1 -0
@@ -23,6 +23,7 @@#include "resolve-undo.h" #include "revision.h" #include "run-command.h" +#include "setup.h" #include "submodule.h" #include "submodule-config.h" #include "tree.h"
builtin/clean.c +1 -0
@@ -14,6 +14,7 @@#include "dir.h" #include "gettext.h" #include "parse-options.h" +#include "setup.h" #include "string-list.h" #include "quote.h" #include "column.h"
builtin/clone.c +1 -0
@@ -33,6 +33,7 @@#include "branch.h" #include "remote.h" #include "run-command.h" +#include "setup.h" #include "connected.h" #include "packfile.h" #include "list-objects-filter-options.h"
builtin/config.c +1 -0
@@ -9,6 +9,7 @@#include "parse-options.h" #include "urlmatch.h" #include "quote.h" +#include "setup.h" #include "worktree.h" #include "wrapper.h"
builtin/describe.c +1 -0
@@ -15,6 +15,7 @@#include "revision.h" #include "diff.h" #include "hashmap.h" +#include "setup.h" #include "strvec.h" #include "run-command.h" #include "object-store.h"
builtin/diff-index.c +1 -0
@@ -5,6 +5,7 @@#include "commit.h" #include "revision.h" #include "builtin.h" +#include "setup.h" #include "submodule.h" static const char diff_cache_usage[] =
builtin/diff.c +1 -0
@@ -19,6 +19,7 @@#include "revision.h" #include "log-tree.h" #include "builtin.h" +#include "setup.h" #include "submodule.h" #include "oid-array.h"
builtin/difftool.c +1 -0
@@ -28,6 +28,7 @@#include "object-store.h" #include "dir.h" #include "entry.h" +#include "setup.h" #include "wrapper.h" static int trust_exit_code;
builtin/gc.c +1 -0
@@ -36,6 +36,7 @@#include "exec-cmd.h" #include "gettext.h" #include "hook.h" +#include "setup.h" #include "wrapper.h" #define FAILED_RUN "failed to run %s"
builtin/grep.c +1 -0
@@ -23,6 +23,7 @@#include "quote.h" #include "dir.h" #include "pathspec.h" +#include "setup.h" #include "submodule.h" #include "submodule-config.h" #include "object-store.h"
builtin/hash-object.c +1 -0
@@ -14,6 +14,7 @@#include "quote.h" #include "parse-options.h" #include "exec-cmd.h" +#include "setup.h" /* * This is to create corrupt objects for debugging and as such it
builtin/help.c +1 -0
@@ -11,6 +11,7 @@#include "config-list.h" #include "help.h" #include "alias.h" +#include "setup.h" #ifndef DEFAULT_HELP_FORMAT #define DEFAULT_HELP_FORMAT "man"
builtin/index-pack.c +1 -0
@@ -20,6 +20,7 @@#include "object-store.h" #include "replace-object.h" #include "promisor-remote.h" +#include "setup.h" #include "wrapper.h" static const char index_pack_usage[] =
builtin/init-db.c +1 -0
@@ -12,6 +12,7 @@#include "builtin.h" #include "exec-cmd.h" #include "parse-options.h" +#include "setup.h" #include "worktree.h" #include "wrapper.h"
builtin/ls-files.c +1 -0
@@ -20,6 +20,7 @@#include "string-list.h" #include "pathspec.h" #include "run-command.h" +#include "setup.h" #include "submodule.h" #include "submodule-config.h"
builtin/merge-file.c +1 -0
@@ -3,6 +3,7 @@#include "cache.h" #include "config.h" #include "gettext.h" +#include "setup.h" #include "xdiff/xdiff.h" #include "xdiff-interface.h" #include "parse-options.h"
builtin/mv.c +1 -0
@@ -16,6 +16,7 @@#include "cache-tree.h" #include "string-list.h" #include "parse-options.h" +#include "setup.h" #include "submodule.h" #include "entry.h"
builtin/read-tree.c +1 -0
@@ -19,6 +19,7 @@#include "builtin.h" #include "parse-options.h" #include "resolve-undo.h" +#include "setup.h" #include "submodule.h" #include "submodule-config.h"
builtin/reset.c +1 -0
@@ -26,6 +26,7 @@#include "parse-options.h" #include "unpack-trees.h" #include "cache-tree.h" +#include "setup.h" #include "submodule.h" #include "submodule-config.h" #include "dir.h"
builtin/rev-parse.c +1 -0
@@ -18,6 +18,7 @@#include "parse-options.h" #include "diff.h" #include "revision.h" +#include "setup.h" #include "split-index.h" #include "submodule.h" #include "commit-reach.h"
builtin/rm.c +1 -0
@@ -15,6 +15,7 @@#include "tree-walk.h" #include "parse-options.h" #include "string-list.h" +#include "setup.h" #include "submodule.h" #include "pathspec.h"
builtin/shortlog.c +1 -0
@@ -9,6 +9,7 @@#include "revision.h" #include "utf8.h" #include "mailmap.h" +#include "setup.h" #include "shortlog.h" #include "parse-options.h" #include "trailer.h"
builtin/sparse-checkout.c +1 -0
@@ -16,6 +16,7 @@#include "unpack-trees.h" #include "wt-status.h" #include "quote.h" +#include "setup.h" #include "sparse-index.h" #include "worktree.h"
builtin/stash.c +1 -0
@@ -18,6 +18,7 @@#include "entry.h" #include "rerere.h" #include "revision.h" +#include "setup.h" #include "log-tree.h" #include "diffcore.h" #include "exec-cmd.h"
builtin/stripspace.c +1 -0
@@ -3,6 +3,7 @@#include "config.h" #include "gettext.h" #include "parse-options.h" +#include "setup.h" #include "strbuf.h" static void comment_lines (struct strbuf *buf)
builtin/submodule--helper.c +1 -0
@@ -12,6 +12,7 @@#include "quote.h" #include "pathspec.h" #include "dir.h" +#include "setup.h" #include "submodule.h" #include "submodule-config.h" #include "string-list.h"
builtin/update-index.c +1 -0
@@ -20,6 +20,7 @@#include "parse-options.h" #include "pathspec.h" #include "dir.h" +#include "setup.h" #include "split-index.h" #include "fsmonitor.h"
cache.h +0 -163
193 lines not on this page · raw message
commit.c +1 -0
@@ -23,6 +23,7 @@#include "refs.h" #include "commit-reach.h" #include "run-command.h" +#include "setup.h" #include "shallow.h" #include "hook.h"
common-main.c +1 -0
@@ -2,6 +2,7 @@#include "exec-cmd.h" #include "gettext.h" #include "attr.h" +#include "setup.h" /* * Many parts of Git have subprograms communicate via pipe, expect the
config.c +1 -0
@@ -27,6 +27,7 @@#include "color.h" #include "replace-object.h" #include "refs.h" +#include "setup.h" #include "worktree.h" #include "wrapper.h"
daemon.c +1 -0
@@ -5,6 +5,7 @@#include "environment.h" #include "pkt-line.h" #include "run-command.h" +#include "setup.h" #include "strbuf.h" #include "string-list.h" #include "wrapper.h"
diff.c +1 -0
@@ -33,6 +33,7 @@#include "help.h" #include "promisor-remote.h" #include "dir.h" +#include "setup.h" #include "strmap.h" #include "wrapper.h"
dir.c +1 -0
@@ -21,6 +21,7 @@#include "varint.h" #include "ewah/ewok.h" #include "fsmonitor.h" +#include "setup.h" #include "submodule-config.h" #include "wrapper.h"
environment.c +1 -0
@@ -22,6 +22,7 @@#include "replace-object.h" #include "tmp-objdir.h" #include "chdir-notify.h" +#include "setup.h" #include "shallow.h" #include "wrapper.h"
git.c +1 -0
@@ -7,6 +7,7 @@#include "run-command.h" #include "alias.h" #include "replace-object.h" +#include "setup.h" #include "shallow.h" #define RUN_SETUP (1<<0)
http-fetch.c +1 -0
@@ -5,6 +5,7 @@#include "hex.h" #include "http.h" #include "walker.h" +#include "setup.h" #include "strvec.h" #include "urlmatch.h" #include "trace2.h"
http-push.c +1 -0
@@ -12,6 +12,7 @@#include "exec-cmd.h" #include "remote.h" #include "list-objects.h" +#include "setup.h" #include "sigchain.h" #include "strvec.h" #include "packfile.h"
imap-send.c +1 -0
@@ -28,6 +28,7 @@#include "gettext.h" #include "run-command.h" #include "parse-options.h" +#include "setup.h" #include "wrapper.h" #if defined(NO_OPENSSL ) && !defined(HAVE_OPENSSL_CSPRNG )typedef void *SSL ;
line-log.c +1 -0
@@ -16,6 +16,7 @@#include "graph.h" #include "userdiff.h" #include "line-log.h" +#include "setup.h" #include "strvec.h" #include "bloom.h"
mailmap.c +1 -0
@@ -3,6 +3,7 @@#include "string-list.h" #include "mailmap.h" #include "object-store.h" +#include "setup.h" #define DEBUG_MAILMAP 0#if DEBUG_MAILMAP
object-file.c +1 -0
@@ -37,6 +37,7 @@#include "packfile.h" #include "object-store.h" #include "promisor-remote.h" +#include "setup.h" #include "submodule.h" #include "fsck.h" #include "wrapper.h"
object-name.c +1 -0
@@ -15,6 +15,7 @@#include "packfile.h" #include "object-store.h" #include "repository.h" +#include "setup.h" #include "submodule.h" #include "midx.h" #include "commit-reach.h"
path.c +1 -0
@@ -11,6 +11,7 @@#include "string-list.h" #include "dir.h" #include "worktree.h" +#include "setup.h" #include "submodule-config.h" #include "path.h" #include "packfile.h"
pathspec.c +1 -0
@@ -6,6 +6,7 @@#include "gettext.h" #include "pathspec.h" #include "attr.h" +#include "setup.h" #include "strvec.h" #include "quote.h"
refs.c +1 -0
@@ -22,6 +22,7 @@#include "worktree.h" #include "strvec.h" #include "repository.h" +#include "setup.h" #include "sigchain.h" #include "date.h" #include "commit.h"
refs/files-backend.c +1 -0
@@ -14,6 +14,7 @@#include "../object.h" #include "../dir.h" #include "../chdir-notify.h" +#include "../setup.h" #include "../worktree.h" #include "../wrapper.h"
remote-curl.c +1 -0
@@ -18,6 +18,7 @@#include "credential.h" #include "oid-array.h" #include "send-pack.h" +#include "setup.h" #include "protocol.h" #include "quote.h" #include "transport.h"
remote.c +1 -0
@@ -15,6 +15,7 @@#include "revision.h" #include "dir.h" #include "tag.h" +#include "setup.h" #include "string-list.h" #include "strvec.h" #include "commit-reach.h"
repository.c +1 -0
@@ -11,6 +11,7 @@#include "object.h" #include "lockfile.h" #include "remote.h" +#include "setup.h" #include "submodule-config.h" #include "sparse-index.h" #include "promisor-remote.h"
revision.c +1 -0
@@ -29,6 +29,7 @@#include "bisect.h" #include "packfile.h" #include "worktree.h" +#include "setup.h" #include "strvec.h" #include "commit-reach.h" #include "commit-graph.h"
scalar.c +1 -0
@@ -15,6 +15,7 @@#include "dir.h" #include "packfile.h" #include "help.h" +#include "setup.h" static void setup_enlistment_directory(int argc, const char **argv, const char * const *usagestr,
setup.c +1 -0
@@ -5,6 +5,7 @@#include "repository.h" #include "config.h" #include "dir.h" +#include "setup.h" #include "string-list.h" #include "chdir-notify.h" #include "promisor-remote.h"
setup.h new file +168 -0
168 lines not on this page · raw message
submodule.c +1 -0
@@ -26,6 +26,7 @@#include "parse-options.h" #include "object-store.h" #include "commit-reach.h" +#include "setup.h" #include "shallow.h" static int config_update_recurse_submodules =RECURSE_SUBMODULES_OFF ;
symlinks.c +1 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "gettext.h" +#include "setup.h" static int threaded_check_leading_path (struct cache_def *cache,const char *name,int len,int warn_on_lstat_err);
t/helper/test-advise.c +1 -0
@@ -2,6 +2,7 @@#include "cache.h" #include "advice.h" #include "config.h" +#include "setup.h" int cmd__advise_if_enabled (int argc,const char **argv) {
t/helper/test-bitmap.c +1 -0
@@ -1,6 +1,7 @@#include "test-tool.h" #include "git-compat-util.h" #include "pack-bitmap.h" +#include "setup.h" static int bitmap_list_commits (void ) {
t/helper/test-bloom.c +1 -0
@@ -3,6 +3,7 @@#include "hex.h" #include "test-tool.h" #include "commit.h" +#include "setup.h" static struct bloom_filter_settings settings =DEFAULT_BLOOM_FILTER_SETTINGS ;
t/helper/test-cache-tree.c +1 -0
@@ -6,6 +6,7 @@#include "tree.h" #include "cache-tree.h" #include "parse-options.h" +#include "setup.h" static char const *const test_cache_tree_usage[] = {N_ ("test-tool cache-tree <options> (control|prime|update)" ),
t/helper/test-config.c +1 -0
@@ -1,6 +1,7 @@#include "test-tool.h" #include "cache.h" #include "config.h" +#include "setup.h" #include "string-list.h" /*
t/helper/test-dump-cache-tree.c +1 -1
@@ -4,7 +4,7 @@#include "hex.h" #include "tree.h" #include "cache-tree.h" - +#include "setup.h" static void dump_one (struct cache_tree *it,const char *pfx,const char *x) {
t/helper/test-dump-fsmonitor.c +1 -0
@@ -1,5 +1,6 @@#include "test-tool.h" #include "cache.h" +#include "setup.h" int cmd__dump_fsmonitor (int ac,const char **av) {
t/helper/test-dump-split-index.c +1 -0
@@ -2,6 +2,7 @@#include "test-tool.h" #include "cache.h" #include "hex.h" +#include "setup.h" #include "split-index.h" #include "ewah/ewok.h"
t/helper/test-dump-untracked-cache.c +1 -0
@@ -3,6 +3,7 @@#include "cache.h" #include "dir.h" #include "hex.h" +#include "setup.h" static int compare_untracked (const void *a_,const void *b_) {
t/helper/test-fast-rebase.c +1 -0
@@ -23,6 +23,7 @@#include "refs.h" #include "revision.h" #include "sequencer.h" +#include "setup.h" #include "strvec.h" #include "tree.h"
t/helper/test-fsmonitor-client.c +1 -0
@@ -7,6 +7,7 @@#include "cache.h" #include "parse-options.h" #include "fsmonitor-ipc.h" +#include "setup.h" #include "thread-utils.h" #include "trace2.h" #include "wrapper.h"
t/helper/test-lazy-init-name-hash.c +1 -0
@@ -3,6 +3,7 @@#include "cache.h" #include "environment.h" #include "parse-options.h" +#include "setup.h" static int single;static int multi;
t/helper/test-match-trees.c +1 -0
@@ -1,6 +1,7 @@#include "test-tool.h" #include "cache.h" #include "hex.h" +#include "setup.h" #include "tree.h" int cmd__match_trees (int ac,const char **av)
t/helper/test-oid-array.c +1 -0
@@ -2,6 +2,7 @@#include "cache.h" #include "hex.h" #include "oid-array.h" +#include "setup.h" static int print_oid (const struct object_id *oid,void *data) {
t/helper/test-oidmap.c +1 -0
@@ -2,6 +2,7 @@#include "cache.h" #include "hex.h" #include "oidmap.h" +#include "setup.h" #include "strbuf.h" /* key is an oid and value is a name (could be a refname for example) */
t/helper/test-oidtree.c +1 -0
@@ -2,6 +2,7 @@#include "cache.h" #include "hex.h" #include "oidtree.h" +#include "setup.h" static enum cb_next print_oid (const struct object_id *oid,void *data) {
t/helper/test-pack-mtimes.c +1 -0
@@ -5,6 +5,7 @@#include "object-store.h" #include "packfile.h" #include "pack-mtimes.h" +#include "setup.h" static void dump_mtimes (struct packed_git *p) {
t/helper/test-partial-clone.c +1 -0
@@ -3,6 +3,7 @@#include "test-tool.h" #include "repository.h" #include "object-store.h" +#include "setup.h" /* * Prints the size of the object corresponding to the given hash in a specific
t/helper/test-path-utils.c +1 -0
@@ -2,6 +2,7 @@#include "cache.h" #include "abspath.h" #include "environment.h" +#include "setup.h" #include "string-list.h" #include "utf8.h"
t/helper/test-proc-receive.c +1 -0
@@ -3,6 +3,7 @@#include "hex.h" #include "parse-options.h" #include "pkt-line.h" +#include "setup.h" #include "sigchain.h" #include "test-tool.h"
t/helper/test-reach.c +1 -0
@@ -8,6 +8,7 @@#include "hex.h" #include "parse-options.h" #include "ref-filter.h" +#include "setup.h" #include "string-list.h" #include "tag.h"
t/helper/test-read-cache.c +1 -0
@@ -2,6 +2,7 @@#include "test-tool.h" #include "cache.h" #include "config.h" +#include "setup.h" #include "wrapper.h" int cmd__read_cache (int argc,const char **argv)
t/helper/test-read-graph.c +1 -0
@@ -4,6 +4,7 @@#include "repository.h" #include "object-store.h" #include "bloom.h" +#include "setup.h" int cmd__read_graph (int argc,const char **argv) {
t/helper/test-read-midx.c +1 -0
@@ -5,6 +5,7 @@#include "repository.h" #include "object-store.h" #include "pack-bitmap.h" +#include "setup.h" static int read_midx_file (const char *object_dir,int show_objects) {
t/helper/test-ref-store.c +1 -0
@@ -2,6 +2,7 @@#include "cache.h" #include "hex.h" #include "refs.h" +#include "setup.h" #include "worktree.h" #include "object-store.h" #include "repository.h"
t/helper/test-repository.c +1 -0
@@ -8,6 +8,7 @@#include "object-store.h" #include "object.h" #include "repository.h" +#include "setup.h" #include "tree.h" static void test_parse_commit_in_graph(const char *gitdir, const char *worktree,
t/helper/test-revision-walking.c +1 -0
@@ -13,6 +13,7 @@#include "commit.h" #include "diff.h" #include "revision.h" +#include "setup.h" static void print_commit (struct commit *commit) {
t/helper/test-scrap-cache-tree.c +1 -0
@@ -2,6 +2,7 @@#include "test-tool.h" #include "cache.h" #include "lockfile.h" +#include "setup.h" #include "tree.h" #include "cache-tree.h"
t/helper/test-serve-v2.c +1 -0
@@ -3,6 +3,7 @@#include "gettext.h" #include "parse-options.h" #include "serve.h" +#include "setup.h" static char const *const serve_usage[] = {N_ ("test-tool serve-v2 [<options>]" ),
t/helper/test-submodule-config.c +1 -0
@@ -1,6 +1,7 @@#include "test-tool.h" #include "cache.h" #include "config.h" +#include "setup.h" #include "submodule-config.h" #include "submodule.h"
t/helper/test-submodule-nested-repo-config.c +1 -0
@@ -1,5 +1,6 @@#include "test-tool.h" #include "cache.h" +#include "setup.h" #include "submodule-config.h" static void die_usage (const char **argv,const char *msg)
t/helper/test-submodule.c +1 -0
@@ -3,6 +3,7 @@#include "cache.h" #include "parse-options.h" #include "remote.h" +#include "setup.h" #include "submodule-config.h" #include "submodule.h"
t/helper/test-subprocess.c +1 -0
@@ -1,6 +1,7 @@#include "test-tool.h" #include "cache.h" #include "run-command.h" +#include "setup.h" int cmd__subprocess (int argc,const char **argv) {
t/helper/test-userdiff.c +1 -0
@@ -1,5 +1,6 @@#include "test-tool.h" #include "cache.h" +#include "setup.h" #include "userdiff.h" #include "config.h"
t/helper/test-write-cache.c +1 -0
@@ -2,6 +2,7 @@#include "test-tool.h" #include "cache.h" #include "lockfile.h" +#include "setup.h" int cmd__write_cache (int argc,const char **argv) {
trace.c +1 -0
@@ -25,6 +25,7 @@#include "abspath.h" #include "environment.h" #include "quote.h" +#include "setup.h" #include "wrapper.h" struct trace_key trace_default_key = {"GIT_TRACE" ,0 ,0 ,0 };
unpack-trees.c +1 -0
@@ -22,6 +22,7 @@#include "promisor-remote.h" #include "entry.h" #include "parallel-checkout.h" +#include "setup.h" /* * Error messages expected by scripts out of plumbing commands such as
worktree.c +1 -0
@@ -5,6 +5,7 @@#include "gettext.h" #include "repository.h" #include "refs.h" +#include "setup.h" #include "strbuf.h" #include "worktree.h" #include "dir.h"
wt-status.c +1 -0
@@ -16,6 +16,7 @@#include "refs.h" #include "submodule.h" #include "column.h" +#include "setup.h" #include "strbuf.h" #include "utf8.h" #include "worktree.h"
Signature · 1 line
gitgitgadget
PATCH v2 14/16 treewide: remove cache.h inclusion due to setup.h changes
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
By moving several declarations to setup.h, the previous patch made it possible to remove the include of cache.h in several source files. Do so.
Signed-off-by Elijah Newren <[email protected]>
--- line-log.c | 1 - path.c | 2 +- t/helper/test-advise.c | 1 - t/helper/test-bloom.c | 3 +-- t/helper/test-config.c | 1 - t/helper/test-pack-mtimes.c | 1 - t/helper/test-partial-clone.c | 3 +-- t/helper/test-proc-receive.c | 3 +-- t/helper/test-read-graph.c | 1 - t/helper/test-ref-store.c | 1 - t/helper/test-repository.c | 1 - t/helper/test-revision-walking.c | 1 - t/helper/test-serve-v2.c | 1 - t/helper/test-submodule-nested-repo-config.c | 1 - t/helper/test-submodule.c | 1 - t/helper/test-subprocess.c | 1 - t/helper/test-userdiff.c | 1 - worktree.c | 2 +- 18 files changed, 5 insertions(+), 21 deletions(-)
line-log.c +0 -1
@@ -1,7 +1,6 @@#include "git-compat-util.h" #include "alloc.h" #include "line-range.h" -#include "cache.h" #include "hex.h" #include "tag.h" #include "blob.h"
path.c +1 -1
@@ -1,7 +1,7 @@/* * Utilities for paths and pathnames */ -#include "cache.h" +#include "git-compat-util.h" #include "abspath.h" #include "environment.h" #include "gettext.h"
t/helper/test-advise.c +0 -1
@@ -1,5 +1,4 @@#include "test-tool.h" -#include "cache.h" #include "advice.h" #include "config.h" #include "setup.h"
t/helper/test-bloom.c +1 -2
@@ -1,7 +1,6 @@ -#include "cache.h" +#include "test-tool.h" #include "bloom.h" #include "hex.h" -#include "test-tool.h" #include "commit.h" #include "setup.h"
t/helper/test-config.c +0 -1
@@ -1,5 +1,4 @@#include "test-tool.h" -#include "cache.h" #include "config.h" #include "setup.h" #include "string-list.h"
t/helper/test-pack-mtimes.c +0 -1
@@ -1,5 +1,4 @@#include "test-tool.h" -#include "cache.h" #include "hex.h" #include "strbuf.h" #include "object-store.h"
t/helper/test-partial-clone.c +1 -2
@@ -1,6 +1,5 @@ -#include "cache.h" -#include "hex.h" #include "test-tool.h" +#include "hex.h" #include "repository.h" #include "object-store.h" #include "setup.h"
t/helper/test-proc-receive.c +1 -2
@@ -1,11 +1,10 @@ -#include "cache.h" +#include "test-tool.h" #include "connect.h" #include "hex.h" #include "parse-options.h" #include "pkt-line.h" #include "setup.h" #include "sigchain.h" -#include "test-tool.h" static const char *proc_receive_usage[] = {"test-tool proc-receive [<options>]" ,
t/helper/test-read-graph.c +0 -1
@@ -1,5 +1,4 @@#include "test-tool.h" -#include "cache.h" #include "commit-graph.h" #include "repository.h" #include "object-store.h"
t/helper/test-ref-store.c +0 -1
@@ -1,5 +1,4 @@#include "test-tool.h" -#include "cache.h" #include "hex.h" #include "refs.h" #include "setup.h"
t/helper/test-repository.c +0 -1
@@ -1,5 +1,4 @@#include "test-tool.h" -#include "cache.h" #include "commit-graph.h" #include "commit.h" #include "config.h"
t/helper/test-revision-walking.c +0 -1
@@ -9,7 +9,6 @@*/ #include "test-tool.h" -#include "cache.h" #include "commit.h" #include "diff.h" #include "revision.h"
t/helper/test-serve-v2.c +0 -1
@@ -1,5 +1,4 @@#include "test-tool.h" -#include "cache.h" #include "gettext.h" #include "parse-options.h" #include "serve.h"
t/helper/test-submodule-nested-repo-config.c +0 -1
@@ -1,5 +1,4 @@#include "test-tool.h" -#include "cache.h" #include "setup.h" #include "submodule-config.h"
t/helper/test-submodule.c +0 -1
@@ -1,6 +1,5 @@#include "test-tool.h" #include "test-tool-utils.h" -#include "cache.h" #include "parse-options.h" #include "remote.h" #include "setup.h"
t/helper/test-subprocess.c +0 -1
@@ -1,5 +1,4 @@#include "test-tool.h" -#include "cache.h" #include "run-command.h" #include "setup.h"
t/helper/test-userdiff.c +0 -1
@@ -1,5 +1,4 @@#include "test-tool.h" -#include "cache.h" #include "setup.h" #include "userdiff.h" #include "config.h"
worktree.c +1 -1
@@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "abspath.h" #include "alloc.h" #include "environment.h"
Signature · 1 line
gitgitgadget
PATCH v2 15/16 write-or-die.h: move declarations for write-or-die.c functions from cache.h
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
Signed-off-by Elijah Newren <[email protected]>
--- archive-tar.c | 1 + archive-zip.c | 1 + builtin/blame.c | 1 + builtin/cat-file.c | 1 + builtin/check-attr.c | 1 + builtin/check-ignore.c | 1 + builtin/check-mailmap.c | 1 + builtin/credential-cache.c | 1 + builtin/credential-store.c | 1 + builtin/grep.c | 1 + builtin/hash-object.c | 1 + builtin/log.c | 1 + builtin/notes.c | 1 + builtin/send-pack.c | 1 + builtin/stripspace.c | 1 + builtin/tag.c | 1 + builtin/update-index.c | 1 + bundle.c | 1 + cache.h | 74 ------------------------------------ config.c | 1 + csum-file.h | 1 + diagnose.c | 1 + environment.c | 1 + http-backend.c | 1 + log-tree.c | 1 + pkt-line.c | 1 + refs/files-backend.c | 1 + refs/packed-backend.c | 1 + remote-curl.c | 1 + send-pack.c | 3 +- sideband.c | 1 + t/helper/test-pkt-line.c | 3 +- upload-pack.c | 1 + write-or-die.c | 3 +- write-or-die.h | 78 ++++++++++++++++++++++++++++++++++++++ 35 files changed, 114 insertions(+), 77 deletions(-) create mode 100644 write-or-die.h
archive-tar.c +1 -0
@@ -11,6 +11,7 @@#include "object-store.h" #include "streaming.h" #include "run-command.h" +#include "write-or-die.h" #define RECORDSIZE (512)#define BLOCKSIZE (RECORDSIZE * 20)
archive-zip.c +1 -0
@@ -10,6 +10,7 @@#include "utf8.h" #include "object-store.h" #include "userdiff.h" +#include "write-or-die.h" #include "xdiff-interface.h" #include "date.h"
builtin/blame.c +1 -0
@@ -33,6 +33,7 @@#include "refs.h" #include "setup.h" #include "tag.h" +#include "write-or-die.h" static char blame_usage[] =N_ ("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" );static char annotate_usage[] =N_ ("git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>" );
builtin/cat-file.c +1 -0
@@ -23,6 +23,7 @@#include "replace-object.h" #include "promisor-remote.h" #include "mailmap.h" +#include "write-or-die.h" enum batch_mode {BATCH_MODE_CONTENTS ,
builtin/check-attr.c +1 -0
@@ -8,6 +8,7 @@#include "quote.h" #include "setup.h" #include "parse-options.h" +#include "write-or-die.h" static int all_attrs;static int cached_attrs;
builtin/check-ignore.c +1 -0
@@ -8,6 +8,7 @@#include "pathspec.h" #include "parse-options.h" #include "submodule.h" +#include "write-or-die.h" static int quiet, verbose, stdin_paths, show_non_matching, no_index;static const char *const check_ignore_usage[] = {
builtin/check-mailmap.c +1 -0
@@ -5,6 +5,7 @@#include "mailmap.h" #include "parse-options.h" #include "string-list.h" +#include "write-or-die.h" static int use_stdin;static const char *const check_mailmap_usage[] = {
builtin/credential-cache.c +1 -0
@@ -2,6 +2,7 @@#include "gettext.h" #include "parse-options.h" #include "wrapper.h" +#include "write-or-die.h" #ifndef NO_UNIX_SOCKETS
builtin/credential-store.c +1 -0
@@ -5,6 +5,7 @@#include "credential.h" #include "string-list.h" #include "parse-options.h" +#include "write-or-die.h" static struct lock_file credential_lock;
builtin/grep.c +1 -0
@@ -28,6 +28,7 @@#include "submodule-config.h" #include "object-store.h" #include "packfile.h" +#include "write-or-die.h" static const char *grep_prefix;
builtin/hash-object.c +1 -0
@@ -15,6 +15,7 @@#include "parse-options.h" #include "exec-cmd.h" #include "setup.h" +#include "write-or-die.h" /* * This is to create corrupt objects for debugging and as such it
builtin/log.c +1 -0
@@ -40,6 +40,7 @@#include "commit-reach.h" #include "range-diff.h" #include "tmp-objdir.h" +#include "write-or-die.h" #define MAIL_DEFAULT_WRAP 72#define COVER_FROM_AUTO_MAX_SUBJECT_LEN 100
builtin/notes.c +1 -0
@@ -25,6 +25,7 @@#include "notes-merge.h" #include "notes-utils.h" #include "worktree.h" +#include "write-or-die.h" static const char *const git_notes_usage[] = {N_ ("git notes [--ref <notes-ref>] [list [<object>]]" ),
builtin/send-pack.c +1 -0
@@ -16,6 +16,7 @@#include "gpg-interface.h" #include "gettext.h" #include "protocol.h" +#include "write-or-die.h" static const char *const send_pack_usage[] = { N_("git send-pack [--mirror] [--dry-run] [--force]\n"
builtin/stripspace.c +1 -0
@@ -5,6 +5,7 @@#include "parse-options.h" #include "setup.h" #include "strbuf.h" +#include "write-or-die.h" static void comment_lines (struct strbuf *buf) {
builtin/tag.c +1 -0
@@ -24,6 +24,7 @@#include "column.h" #include "ref-filter.h" #include "date.h" +#include "write-or-die.h" static const char *const git_tag_usage[] = { N_("git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
builtin/update-index.c +1 -0
@@ -23,6 +23,7 @@#include "setup.h" #include "split-index.h" #include "fsmonitor.h" +#include "write-or-die.h" /* * Default to not allowing changes to the list of files. The
bundle.c +1 -0
@@ -16,6 +16,7 @@#include "strvec.h" #include "list-objects-filter-options.h" #include "connected.h" +#include "write-or-die.h" static const char v2_bundle_signature[] ="# v2 git bundle\n" ;static const char v3_bundle_signature[] ="# v3 git bundle\n" ;
cache.h +0 -74
92 lines not on this page · raw message
config.c +1 -0
@@ -30,6 +30,7 @@#include "setup.h" #include "worktree.h" #include "wrapper.h" +#include "write-or-die.h" struct config_source {struct config_source *prev;
csum-file.h +1 -0
@@ -3,6 +3,7 @@#include "cache.h" #include "hash.h" +#include "write-or-die.h" struct progress ;
diagnose.c +1 -0
@@ -9,6 +9,7 @@#include "strvec.h" #include "object-store.h" #include "packfile.h" +#include "write-or-die.h" struct archive_dir {const char *path;
environment.c +1 -0
@@ -25,6 +25,7 @@#include "setup.h" #include "shallow.h" #include "wrapper.h" +#include "write-or-die.h" int trust_executable_bit =1 ;int trust_ctime =1 ;
http-backend.c +1 -0
@@ -18,6 +18,7 @@#include "protocol.h" #include "date.h" #include "wrapper.h" +#include "write-or-die.h" static const char content_type[] ="Content-Type" ;static const char content_length[] ="Content-Length" ;
log-tree.c +1 -0
@@ -23,6 +23,7 @@#include "help.h" #include "range-diff.h" #include "strmap.h" +#include "write-or-die.h" static struct decoration name_decoration = {"object names" };static int decoration_loaded;
pkt-line.c +1 -0
@@ -4,6 +4,7 @@#include "hex.h" #include "run-command.h" #include "wrapper.h" +#include "write-or-die.h" char packet_buffer[LARGE_PACKET_MAX ];static const char *packet_trace_prefix ="git" ;
refs/files-backend.c +1 -0
@@ -17,6 +17,7 @@#include "../setup.h" #include "../worktree.h" #include "../wrapper.h" +#include "../write-or-die.h" /* * This backend uses the following flags in `ref_update::flags` for
refs/packed-backend.c +1 -0
@@ -9,6 +9,7 @@#include "../iterator.h" #include "../lockfile.h" #include "../chdir-notify.h" +#include "../write-or-die.h" enum mmap_strategy {/*
remote-curl.c +1 -0
@@ -22,6 +22,7 @@#include "protocol.h" #include "quote.h" #include "transport.h" +#include "write-or-die.h" static struct remote *remote;/* always ends with a trailing slash */
send-pack.c +2 -1
@@ -16,8 +16,9 @@#include "version.h" #include "oid-array.h" #include "gpg-interface.h" -#include "cache.h" #include "shallow.h" +#include "trace2.h" +#include "write-or-die.h" int option_parse_push_signed (const struct option *opt,const char *arg,int unset)
sideband.c +1 -0
@@ -5,6 +5,7 @@#include "sideband.h" #include "help.h" #include "pkt-line.h" +#include "write-or-die.h" struct keyword_entry {/*
t/helper/test-pkt-line.c +2 -1
@@ -1,6 +1,7 @@ -#include "cache.h" +#include "git-compat-util.h" #include "test-tool.h" #include "pkt-line.h" +#include "write-or-die.h" static void pack_line (const char *line) {
upload-pack.c +1 -0
@@ -30,6 +30,7 @@#include "commit-graph.h" #include "commit-reach.h" #include "shallow.h" +#include "write-or-die.h" /* Remember to update object flag allocation in object.h */ #define THEY_HAVE (1u << 11)
write-or-die.c +2 -1
@@ -1,7 +1,8 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" #include "run-command.h" #include "wrapper.h" +#include "write-or-die.h" /* * Some cases use stdio, but want to flush after the write
write-or-die.h new file +78 -0
78 lines not on this page · raw message
Signature · 1 line
gitgitgadget
PATCH v2 16/16 csum-file.h: remove unnecessary inclusion of cache.h
In reply to Elijah Newren via GitGitGadgetFrom: Elijah Newren <[email protected]>
With the change in the last commit to move several functions to write-or-die.h, csum-file.h no longer needs to include cache.h. However, removing that include forces several other C files, which directly or indirectly dependend upon csum-file.h's inclusion of cache.h, to now be more explicit about their dependencies.
Signed-off-by Elijah Newren <[email protected]>
--- bulk-checkin.c | 2 +- chunk-format.c | 1 + commit-graph.c | 2 +- csum-file.h | 1 - delta-islands.c | 2 +- fetch-pack.c | 2 +- midx.c | 2 +- object-file.c | 2 +- pack-bitmap-write.c | 3 ++- pack-bitmap.c | 2 +- pack.h | 2 ++ packfile.c | 2 +- 12 files changed, 13 insertions(+), 10 deletions(-)
bulk-checkin.c +1 -1
@@ -1,7 +1,7 @@/* * Copyright (c) 2011, Google Inc. */ -#include "git-compat-util.h" +#include "cache.h" #include "alloc.h" #include "bulk-checkin.h" #include "environment.h"
chunk-format.c +1 -0
@@ -3,6 +3,7 @@#include "chunk-format.h" #include "csum-file.h" #include "gettext.h" +#include "trace2.h" /* * When writing a chunk-based file format, collect the chunks in
commit-graph.c +1 -1
@@ -1,4 +1,4 @@ -#include "git-compat-util.h" +#include "cache.h" #include "config.h" #include "gettext.h" #include "hex.h"
csum-file.h +0 -1
@@ -1,7 +1,6 @@#ifndef CSUM_FILE_H #define CSUM_FILE_H -#include "cache.h" #include "hash.h" #include "write-or-die.h"
delta-islands.c +1 -1
@@ -1,4 +1,4 @@ -#include "git-compat-util.h" +#include "cache.h" #include "alloc.h" #include "attr.h" #include "object.h"
fetch-pack.c +1 -1
@@ -1,4 +1,4 @@ -#include "git-compat-util.h" +#include "cache.h" #include "alloc.h" #include "repository.h" #include "config.h"
midx.c +1 -1
@@ -1,4 +1,4 @@ -#include "git-compat-util.h" +#include "cache.h" #include "abspath.h" #include "alloc.h" #include "config.h"
object-file.c +1 -1
@@ -6,7 +6,7 @@* This handles basic git object files - packing, unpacking, * creation etc. */ -#include "git-compat-util.h" +#include "cache.h" #include "abspath.h" #include "alloc.h" #include "config.h"
pack-bitmap-write.c +2 -1
@@ -1,4 +1,4 @@ -#include "git-compat-util.h" +#include "cache.h" #include "alloc.h" #include "environment.h" #include "gettext.h"
@@ -17,6 +17,7 @@#include "pack-objects.h" #include "commit-reach.h" #include "prio-queue.h" +#include "trace2.h" struct bitmapped_commit {struct commit *commit;
pack-bitmap.c +1 -1
@@ -1,4 +1,4 @@ -#include "git-compat-util.h" +#include "cache.h" #include "alloc.h" #include "commit.h" #include "gettext.h"
pack.h +2 -0
@@ -4,6 +4,8 @@#include "object.h" #include "csum-file.h" +struct packed_git ; +struct pack_window ;struct repository ;/*
packfile.c +1 -1
@@ -1,4 +1,4 @@ -#include "git-compat-util.h" +#include "cache.h" #include "alloc.h" #include "environment.h" #include "gettext.h"
Signature · 1 line
gitgitgadget
Quoted 4 lines · Elijah Newren via GitGitGadget
* Patch 1: leftover cleanup from en/header-cleanups (now in master) that should have been included in that series
* Patches 2-4: cleanups aroundgettext.h. Without these patches, many gettext inclusions would have to be squashed into later patches and make
Quoted 8 lines
them harder to review. Also, the implicit dependency on
gettext.hwas making it much harder to find other dependencies.
* Patch 5: move some global var declarations fromcache.hinto the header associated with where the vars are declared
* Patches 6-16: move header declarations fromcache.hinto a header named the same as the source file containing the actual functions (e.g. move declarations forabspath.cfunctions fromcache.hintoabspath.h), and reduce the dependencies oncache.haccordingly.
Thanks for the effort. All the changes look good to me. (As for whether gettext.h should go into cache.h/git-compat-util.h, I think that individual files that use it should include it themselves, just as you have done in this patch set. This means, among other things, that we can reuse Git code in other projects that do not use gettext.)