From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: avarab@gmail.com, peff@peff.net, ramsay@ramsayjones.plus.com,
Elijah Newren <newren@gmail.com>
Subject: [PATCHv3 3/6] Move definition of enum branch_track from cache.h to branch.h
Date: Mon, 13 Aug 2018 10:17:46 -0700 [thread overview]
Message-ID: <20180813171749.10481-4-newren@gmail.com> (raw)
In-Reply-To: <20180813171749.10481-1-newren@gmail.com>
'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.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
branch.h | 11 +++++++++++
cache.h | 10 ----------
config.c | 1 +
environment.c | 1 +
4 files changed, 13 insertions(+), 10 deletions(-)
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. */
/*
diff --git a/cache.h b/cache.h
index 8dc7134f00..a1c0c594fb 100644
--- a/cache.h
+++ b/cache.h
@@ -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;
diff --git a/config.c b/config.c
index 66645047eb..66dca7978a 100644
--- a/config.c
+++ b/config.c
@@ -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"
--
2.18.0.549.gd4454f3f9b
next prev parent reply other threads:[~2018-08-13 17:20 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-11 4:32 [PATCH 0/9] Add missing includes and forward declares Elijah Newren
2018-08-11 4:32 ` [PATCH 1/9] " Elijah Newren
2018-08-11 17:43 ` Jeff King
2018-08-11 4:32 ` [PATCH 2/9] alloc: make allocate_alloc_state and clear_alloc_state more consistent Elijah Newren
2018-08-11 4:32 ` [PATCH 3/9] Move definition of enum branch_track from cache.h to branch.h Elijah Newren
2018-08-11 4:32 ` [PATCH 4/9] urlmatch.h: fix include guard Elijah Newren
2018-08-11 4:32 ` [PATCH 5/9] compat/precompose_utf8.h: use more common include guard style Elijah Newren
2018-08-11 4:32 ` [PATCH 6/9] ewah/ewok.h: add missing include Elijah Newren
2018-08-11 4:32 ` [PATCH 7/9] sha1dc/sha1.h: " Elijah Newren
2018-08-11 4:32 ` [PATCH 8/9] xdiff/xdiff.h: " Elijah Newren
2018-08-11 4:32 ` [PATCH 9/9] Add missing includes and forward declares Elijah Newren
2018-08-11 8:30 ` [PATCH 0/9] " Ævar Arnfjörð Bjarmason
2018-08-11 8:59 ` Elijah Newren
2018-08-11 17:34 ` Jeff King
2018-08-13 18:24 ` Junio C Hamano
2018-08-14 6:42 ` Elijah Newren
2018-08-15 5:45 ` Junio C Hamano
2018-08-15 5:57 ` Elijah Newren
2018-08-15 15:43 ` Junio C Hamano
2018-08-15 15:55 ` Elijah Newren
2018-08-15 16:11 ` Junio C Hamano
2018-08-15 1:38 ` Jeff King
2018-08-15 4:55 ` Jonathan Nieder
2018-08-15 4:57 ` Jonathan Nieder
2018-08-11 20:50 ` [PATCHv2 0/6] " Elijah Newren
2018-08-11 20:50 ` [PATCHv2 1/6] " Elijah Newren
2018-08-11 20:50 ` [PATCHv2 2/6] alloc: make allocate_alloc_state and clear_alloc_state more consistent Elijah Newren
2018-08-11 20:50 ` [PATCHv2 3/6] Move definition of enum branch_track from cache.h to branch.h Elijah Newren
2018-08-11 21:32 ` Ramsay Jones
2018-08-11 20:50 ` [PATCHv2 4/6] urlmatch.h: fix include guard Elijah Newren
2018-08-11 20:50 ` [PATCHv2 5/6] compat/precompose_utf8.h: use more common include guard style Elijah Newren
2018-08-11 20:50 ` [PATCHv2 6/6] Add missing includes and forward declares Elijah Newren
2018-08-13 17:17 ` [PATCHv3 0/6] " Elijah Newren
2018-08-13 17:17 ` [PATCHv3 1/6] " Elijah Newren
2018-08-15 5:10 ` Jonathan Nieder
2018-08-15 5:50 ` Elijah Newren
2018-08-15 6:13 ` Jonathan Nieder
2018-08-15 6:51 ` Elijah Newren
2018-08-15 15:26 ` Elijah Newren
2018-08-13 17:17 ` [PATCHv3 2/6] alloc: make allocate_alloc_state and clear_alloc_state more consistent Elijah Newren
2018-08-15 5:18 ` Jonathan Nieder
2018-08-13 17:17 ` Elijah Newren [this message]
2018-08-15 5:22 ` [PATCHv3 3/6] Move definition of enum branch_track from cache.h to branch.h Jonathan Nieder
2018-08-13 17:17 ` [PATCHv3 4/6] urlmatch.h: fix include guard Elijah Newren
2018-08-15 5:25 ` Jonathan Nieder
2018-08-13 17:17 ` [PATCHv3 5/6] compat/precompose_utf8.h: use more common include guard style Elijah Newren
2018-08-15 5:28 ` Jonathan Nieder
2018-08-13 17:17 ` [PATCHv3 6/6] Add missing includes and forward declares Elijah Newren
2018-08-15 5:31 ` Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180813171749.10481-4-newren@gmail.com \
--to=newren@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).