diff options
| author | Elijah Newren <newren@gmail.com> | 2018-08-15 10:54:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-15 11:52:09 -0700 |
| commit | e730b81df6bff6f78ecd705a1f8e5df48cac75ca (patch) | |
| tree | d1111c9052968dce95ad7a59943a44f25001825b | |
| parent | 17313107454de99c0ebdf1a981b1f6a2b17dc2f5 (diff) | |
| download | git-e730b81df6bff6f78ecd705a1f8e5df48cac75ca.tar.gz | |
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 <jrnieder@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | branch.h | 11 | ||||
| -rw-r--r-- | cache.h | 10 | ||||
| -rw-r--r-- | config.c | 1 | ||||
| -rw-r--r-- | environment.c | 1 |
4 files changed, 13 insertions, 10 deletions
@@ -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. */ /* @@ -919,15 +919,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, @@ -944,7 +935,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; @@ -6,6 +6,7 @@ * */ #include "cache.h" +#include "branch.h" #include "config.h" #include "repository.h" #include "lockfile.h" diff --git a/environment.c b/environment.c index 6cf0079389..0c04a6da7a 100644 --- a/environment.c +++ b/environment.c @@ -8,6 +8,7 @@ * are. */ #include "cache.h" +#include "branch.h" #include "repository.h" #include "config.h" #include "refs.h" |