diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-06 20:38:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-06 20:38:31 (GMT) |
| commit | 6047b28eb7e1a0b0061c5310034f7b5683ea401a (patch) | |
| tree | aaf1292a72a358ebefa2e5e12756a84ecf1fba02 /xdiff-interface.c | |
| parent | 72871b198f50962a555685726e42f435cdd4efa1 (diff) | |
| parent | ec2f02696157d3781fbfd410f0017c49cc1eda01 (diff) | |
| download | git-6047b28eb7e1a0b0061c5310034f7b5683ea401a.zip git-6047b28eb7e1a0b0061c5310034f7b5683ea401a.tar.gz git-6047b28eb7e1a0b0061c5310034f7b5683ea401a.tar.bz2 | |
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 'xdiff-interface.c')
| -rw-r--r-- | xdiff-interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c index 0617fad..0460e03 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" #include "hex.h" #include "object-store.h" |