diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-08-20 22:41:32 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 22:41:32 +0300 |
commit | 5ade03446430f1190fdf1eca8b8fde5f63367110 (patch) | |
tree | ba0c1878e9d5c96cfcb9668a3756a80b73600789 /cache.h | |
parent | 36f0f344e71b928d47871e39fcef1908cb47c47b (diff) | |
parent | 1076f1e454dae338cee8e48f3e69b58181e5e10a (diff) |
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 'cache.h')
-rw-r--r-- | cache.h | 10 |
1 files changed, 0 insertions, 10 deletions
@@ -917,15 +917,6 @@ enum log_refs_config { }; extern enum log_refs_config log_all_ref_updates; -enum branch_track { - BRANCH_TRACK_UNSPECIFIED = -1, - BRANCH_TRACK_NEVER = 0, - BRANCH_TRACK_REMOTE, - BRANCH_TRACK_ALWAYS, - BRANCH_TRACK_EXPLICIT, - BRANCH_TRACK_OVERRIDE -}; - enum rebase_setup_type { AUTOREBASE_NEVER = 0, AUTOREBASE_LOCAL, @@ -942,7 +933,6 @@ enum push_default_type { PUSH_DEFAULT_UNSPECIFIED }; -extern enum branch_track git_branch_track; extern enum rebase_setup_type autorebase; extern enum push_default_type push_default; |