diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-06-29 16:43:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-06-29 16:43:21 -0700 |
| commit | a1264a08a1a6e0cd7e510c899cd0ba42dcf1045d (patch) | |
| tree | d6a22be96e39e1284d9838ce5e8ad58941c5099b /sequencer.c | |
| parent | b2166b0d496c2f3df96929da300039a01227e719 (diff) | |
| parent | 68d686460f58e45f2eb080e0cdf314987eca5ce5 (diff) | |
| download | git-a1264a08a1a6e0cd7e510c899cd0ba42dcf1045d.tar.xz | |
Merge branch 'en/header-split-cache-h-part-3'
Header files cleanup.
* en/header-split-cache-h-part-3: (28 commits)
fsmonitor-ll.h: split this header out of fsmonitor.h
hash-ll, hashmap: move oidhash() to hash-ll
object-store-ll.h: split this header out of object-store.h
khash: name the structs that khash declares
merge-ll: rename from ll-merge
git-compat-util.h: remove unneccessary include of wildmatch.h
builtin.h: remove unneccessary includes
list-objects-filter-options.h: remove unneccessary include
diff.h: remove unnecessary include of oidset.h
repository: remove unnecessary include of path.h
log-tree: replace include of revision.h with simple forward declaration
cache.h: remove this no-longer-used header
read-cache*.h: move declarations for read-cache.c functions from cache.h
repository.h: move declaration of the_index from cache.h
merge.h: move declarations for merge.c from cache.h
diff.h: move declaration for global in diff.c from cache.h
preload-index.h: move declarations for preload-index.c from elsewhere
sparse-index.h: move declarations for sparse-index.c from cache.h
name-hash.h: move declarations for name-hash.c from cache.h
run-command.h: move declarations for run-command.c from cache.h
...
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c index bceb6abcb6..8dd5bdeb36 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "abspath.h" #include "advice.h" #include "alloc.h" @@ -11,7 +11,7 @@ #include "dir.h" #include "object-file.h" #include "object-name.h" -#include "object-store.h" +#include "object-store-ll.h" #include "object.h" #include "pager.h" #include "commit.h" @@ -23,11 +23,14 @@ #include "utf8.h" #include "cache-tree.h" #include "diff.h" +#include "path.h" #include "revision.h" #include "rerere.h" +#include "merge.h" #include "merge-ort.h" #include "merge-ort-wrappers.h" #include "refs.h" +#include "sparse-index.h" #include "strvec.h" #include "quote.h" #include "trailer.h" |