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>
Elijah Newren committed
Aug 15, 2018 at 10:54 UTC
e730b81df6bff6f78ecd705a1f8e5df48cac75ca
4 files changed
+13
-10
branch.h
+11
@@ -3,6 +3,17 @@
3
4
struct strbuf;
5
6
+enum branch_track {
7
+ BRANCH_TRACK_UNSPECIFIED = -1,
8
+ BRANCH_TRACK_NEVER = 0,
9
+ BRANCH_TRACK_REMOTE,
10
+ BRANCH_TRACK_ALWAYS,
11
+ BRANCH_TRACK_EXPLICIT,
12
+ BRANCH_TRACK_OVERRIDE
13
+};
14
+
15
+extern enum branch_track git_branch_track;
16
+
17
/* Functions for acting on the information about branches. */
18
19
/*
cache.h
-10
@@ -919,15 +919,6 @@ enum log_refs_config {
919
};
920
extern enum log_refs_config log_all_ref_updates;
921
922
-enum branch_track {
923
- BRANCH_TRACK_UNSPECIFIED = -1,
924
- BRANCH_TRACK_NEVER = 0,
925
- BRANCH_TRACK_REMOTE,
926
- BRANCH_TRACK_ALWAYS,
927
- BRANCH_TRACK_EXPLICIT,
928
- BRANCH_TRACK_OVERRIDE
929
-};
930
-
922
enum rebase_setup_type {
923
AUTOREBASE_NEVER = 0,
924
AUTOREBASE_LOCAL,
@@ -944,7 +935,6 @@ enum push_default_type {
935
PUSH_DEFAULT_UNSPECIFIED
936
};
937
947
-extern enum branch_track git_branch_track;
938
extern enum rebase_setup_type autorebase;
939
extern enum push_default_type push_default;
940
config.c
+1
@@ -6,6 +6,7 @@
6
*
7
*/
8
#include "cache.h"
9
+#include "branch.h"
10
#include "config.h"
11
#include "repository.h"
12
#include "lockfile.h"
environment.c
+1
@@ -8,6 +8,7 @@
8
* are.
9
*/
10
#include "cache.h"
11
+#include "branch.h"
12
#include "repository.h"
13
#include "config.h"
14
#include "refs.h"