From e730b81df6bff6f78ecd705a1f8e5df48cac75ca Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Wed, 15 Aug 2018 10:54:07 -0700 Subject: Move definition of enum branch_track from cache.h to branch.h 'branch_track' feels more closely related to branching, and it is needed later in branch.h; rather than #include'ing cache.h in branch.h for this small enum, just move the enum and the external declaration for git_branch_track to branch.h. Reviewed-by: Jonathan Nieder Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- branch.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'branch.h') diff --git a/branch.h b/branch.h index 7d9b330eba..5cace4581f 100644 --- a/branch.h +++ b/branch.h @@ -3,6 +3,17 @@ 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. */ /* -- cgit v1.2.3