diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-06 13:38:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-06 13:38:31 -0700 |
| commit | 6047b28eb7e1a0b0061c5310034f7b5683ea401a (patch) | |
| tree | aaf1292a72a358ebefa2e5e12756a84ecf1fba02 /notes-merge.c | |
| parent | 72871b198f50962a555685726e42f435cdd4efa1 (diff) | |
| parent | ec2f02696157d3781fbfd410f0017c49cc1eda01 (diff) | |
| download | git-6047b28eb7e1a0b0061c5310034f7b5683ea401a.tar.gz | |
Merge branch 'en/header-split-cleanup'
Split key function and data structure definitions out of cache.h to
new header files and adjust the users.
* en/header-split-cleanup:
csum-file.h: remove unnecessary inclusion of cache.h
write-or-die.h: move declarations for write-or-die.c functions from cache.h
treewide: remove cache.h inclusion due to setup.h changes
setup.h: move declarations for setup.c functions from cache.h
treewide: remove cache.h inclusion due to environment.h changes
environment.h: move declarations for environment.c functions from cache.h
treewide: remove unnecessary includes of cache.h
wrapper.h: move declarations for wrapper.c functions from cache.h
path.h: move function declarations for path.c functions from cache.h
cache.h: remove expand_user_path()
abspath.h: move absolute path functions from cache.h
environment: move comment_line_char from cache.h
treewide: remove unnecessary cache.h inclusion from several sources
treewide: remove unnecessary inclusion of gettext.h
treewide: be explicit about dependence on gettext.h
treewide: remove unnecessary cache.h inclusion from a few headers
Diffstat (limited to 'notes-merge.c')
| -rw-r--r-- | notes-merge.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/notes-merge.c b/notes-merge.c index 571ecf15c7..c40107c3aa 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -1,5 +1,6 @@ #include "cache.h" #include "commit.h" +#include "gettext.h" #include "refs.h" #include "object-store.h" #include "repository.h" @@ -14,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; |