Code

fsck.c: fix bogus "empty tree" check
[git.git] / cache.h
diff --git a/cache.h b/cache.h
index 9ebe7913b01aed7cbfa089ce811e57bbc64a6e15..e23030262328761669f4704a3e3731a5e93d5b0c 100644 (file)
--- 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);