diff options
| author | Elijah Newren <newren@gmail.com> | 2023-03-21 07:25:58 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-21 18:56:52 +0100 |
| commit | 0b027f6ca79cafbc14f36ff1741fc7378282f295 (patch) | |
| tree | 8664359f8aadf94ee7cd79839244198e6cbd78d4 /builtin/merge.c | |
| parent | environment: move comment_line_char from cache.h (diff) | |
| download | git-0b027f6ca79cafbc14f36ff1741fc7378282f295.tar.xz git-0b027f6ca79cafbc14f36ff1741fc7378282f295.zip | |
abspath.h: move absolute path functions from cache.h
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 <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 2c9da4b23d..38243e55c5 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -8,6 +8,7 @@ #define USE_THE_INDEX_VARIABLE #include "cache.h" +#include "abspath.h" #include "alloc.h" #include "config.h" #include "environment.h" |