diff options
| author | Elijah Newren <newren@gmail.com> | 2023-02-24 00:09:30 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-23 17:25:29 -0800 |
| commit | a64215b6cd5e67939187475c5b248dc5d13e3d60 (patch) | |
| tree | d94a55def948e5f8c1c05cef23e7fb69b4ffa198 /diff-merges.c | |
| parent | ident.h: move ident-related declarations out of cache.h (diff) | |
| download | git-a64215b6cd5e67939187475c5b248dc5d13e3d60.tar.gz git-a64215b6cd5e67939187475c5b248dc5d13e3d60.zip | |
object.h: stop depending on cache.h; make cache.h depend on object.h
Things should be able to depend on object.h without pulling in all of
cache.h. Move an enum to allow this.
Note that a couple files previously depended on things brought in
through cache.h indirectly (revision.h -> commit.h -> object.h ->
cache.h). As such, this change requires making existing dependencies
more explicit in half a dozen files. The inclusion of strbuf.h in
some headers if of particular note: these headers directly embedded a
strbuf in some new structs, meaning they should have been including
strbuf.h all along but were indirectly getting the necessary
definitions.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-merges.c')
| -rw-r--r-- | diff-merges.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/diff-merges.c b/diff-merges.c index faa7bc73a3..ec97616db1 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -1,6 +1,7 @@ #include "git-compat-util.h" #include "diff-merges.h" +#include "gettext.h" #include "revision.h" typedef void (*diff_merges_setup_func_t)(struct rev_info *); |