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>

diff --git a/branch.h b/branch.h
index 7d9b330ebabacb70ae428a92a7e4487116e91f54..5cace4581fe43aa5fdc20b4315cee6eff1034003 100644 (file)
--- a/branch.h
+++ b/branch.h
@@ -3,6 +3,17 @@
 
 struct strbuf;
 
 
 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. */
 
 /*
 /* Functions for acting on the information about branches. */
 
 /*

diff --git a/cache.h b/cache.h
index 8dc7134f002e0f8bfe693d2679cda6a95fc7c118..a1c0c594fb7ca6900f2602df4fc7f7cae8c14610 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -919,15 +919,6 @@ enum log_refs_config {
 };
 extern enum log_refs_config log_all_ref_updates;
 
 };
 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,
 enum rebase_setup_type {
        AUTOREBASE_NEVER = 0,
        AUTOREBASE_LOCAL,


@@ -944,7 +935,6 @@ enum push_default_type {
        PUSH_DEFAULT_UNSPECIFIED
 };
 
        PUSH_DEFAULT_UNSPECIFIED
 };
 

-extern enum branch_track git_branch_track;

 extern enum rebase_setup_type autorebase;
 extern enum push_default_type push_default;
 
 extern enum rebase_setup_type autorebase;
 extern enum push_default_type push_default;
 

diff --git a/config.c b/config.c
index 66645047eb3f9f84f185e0339807548fd562ea7d..66dca7978a85a60edcc9a97c14efeab235715ab9 100644 (file)
--- a/config.c
+++ b/config.c
@@ -6,6 +6,7 @@
  *
  */
 #include "cache.h"
  *
  */
 #include "cache.h"

+#include "branch.h"

 #include "config.h"
 #include "repository.h"
 #include "lockfile.h"
 #include "config.h"
 #include "repository.h"
 #include "lockfile.h"

diff --git a/environment.c b/environment.c
index 6cf00793894f75230e5d66d39d56fe2e5388c8a6..0c04a6da7a948bbb0626f55a11571769cc100d51 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -8,6 +8,7 @@
  * are.
  */
 #include "cache.h"
  * are.
  */
 #include "cache.h"

+#include "branch.h"

 #include "repository.h"
 #include "config.h"
 #include "refs.h"
 #include "repository.h"
 #include "config.h"
 #include "refs.h"