X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=cache.h;h=e23030262328761669f4704a3e3731a5e93d5b0c;hb=79b1138e7894ea048008f6b99908f5cd36e94949;hp=9ebe7913b01aed7cbfa089ce811e57bbc64a6e15;hpb=5a4d707a6d914fcea302e299fc18892d9e42c767;p=git.git

diff --git a/cache.h b/cache.h
index 9ebe7913b..e23030262 100644
--- a/cache.h
+++ b/cache.h
@@ -274,6 +274,7 @@ enum object_type {
 	/* 5 for future expansion */
 	OBJ_OFS_DELTA = 6,
 	OBJ_REF_DELTA = 7,
+	OBJ_ANY,
 	OBJ_MAX,
 };
 
@@ -425,6 +426,15 @@ enum safe_crlf {
 
 extern enum safe_crlf safe_crlf;
 
+enum branch_track {
+	BRANCH_TRACK_NEVER = 0,
+	BRANCH_TRACK_REMOTE,
+	BRANCH_TRACK_ALWAYS,
+	BRANCH_TRACK_EXPLICIT,
+};
+
+extern enum branch_track git_branch_track;
+
 #define GIT_REPO_VERSION 0
 extern int repository_format_version;
 extern int check_repository_format(void);