undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move definition of enum branch_track from cache.h to branch.h

Browse Source 
'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>
This commit is contained in:
Elijah Newren 2018-08-15 10:54:07 -07:00 committed by Junio C Hamano
parent 1731310745
commit e730b81df6
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
branch.h
View File

@ -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. */
/* /*

10
cache.h
View File

@ -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 { enum rebase_setup_type {
AUTOREBASE_NEVER = 0, AUTOREBASE_NEVER = 0,
AUTOREBASE_LOCAL, 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 rebase_setup_type autorebase;
extern enum push_default_type push_default; extern enum push_default_type push_default;

1
config.c
View File

@ -6,6 +6,7 @@
* *
*/ */
#include "cache.h" #include "cache.h"
#include "branch.h"
#include "config.h" #include "config.h"
#include "repository.h" #include "repository.h"
#include "lockfile.h" #include "lockfile.h"

1
environment.c
View File

@ -8,6 +8,7 @@
* are. * are.
*/ */
#include "cache.h" #include "cache.h"
#include "branch.h"
#include "repository.h" #include "repository.h"
#include "config.h" #include "config.h"
#include "refs.h" #include "refs.h"