diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-20 12:41:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 12:41:32 -0700 |
| commit | 5ade03446430f1190fdf1eca8b8fde5f63367110 (patch) | |
| tree | ba0c1878e9d5c96cfcb9668a3756a80b73600789 /unpack-trees.h | |
| parent | 36f0f344e71b928d47871e39fcef1908cb47c47b (diff) | |
| parent | 1076f1e454dae338cee8e48f3e69b58181e5e10a (diff) | |
| download | git-5ade03446430f1190fdf1eca8b8fde5f63367110.tar.gz git-5ade03446430f1190fdf1eca8b8fde5f63367110.tar.xz | |
Merge branch 'en/incl-forward-decl'
Code hygiene improvement for the header files.
* en/incl-forward-decl:
Remove forward declaration of an enum
compat/precompose_utf8.h: use more common include guard style
urlmatch.h: fix include guard
Move definition of enum branch_track from cache.h to branch.h
alloc: make allocate_alloc_state and clear_alloc_state more consistent
Add missing includes and forward declarations
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index 534358fcc..847f217db 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -1,11 +1,14 @@ #ifndef UNPACK_TREES_H #define UNPACK_TREES_H -#include "tree-walk.h" +#include "cache.h" #include "argv-array.h" +#include "string-list.h" +#include "tree-walk.h" #define MAX_UNPACK_TREES 8 +struct cache_entry; struct unpack_trees_options; struct exclude_list; |