diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-08-20 19:41:32 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 19:41:32 (GMT) |
commit | 5ade03446430f1190fdf1eca8b8fde5f63367110 (patch) | |
tree | ba0c1878e9d5c96cfcb9668a3756a80b73600789 /branch.h | |
parent | 36f0f344e71b928d47871e39fcef1908cb47c47b (diff) | |
parent | 1076f1e454dae338cee8e48f3e69b58181e5e10a (diff) | |
download | git-5ade03446430f1190fdf1eca8b8fde5f63367110.zip git-5ade03446430f1190fdf1eca8b8fde5f63367110.tar.gz git-5ade03446430f1190fdf1eca8b8fde5f63367110.tar.bz2 |
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 'branch.h')
-rw-r--r-- | branch.h | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -1,6 +1,19 @@ #ifndef BRANCH_H #define BRANCH_H +struct strbuf; + +enum branch_track { + BRANCH_TRACK_UNSPECIFIED = -1, + BRANCH_TRACK_NEVER = 0, + BRANCH_TRACK_REMOTE, + BRANCH_TRACK_ALWAYS, + BRANCH_TRACK_EXPLICIT, + BRANCH_TRACK_OVERRIDE +}; + +extern enum branch_track git_branch_track; + /* Functions for acting on the information about branches. */ /* |