Merge branch 'np/verify-pack'

diff --git a/cache.h b/cache.h
index 928ae9f148dae6361b6300aea9e76f22e0c23e60..ab9f97efc6be1e40a59e03463aa921d339420f6c 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -223,7 +223,8 @@ struct index_state {
        struct cache_tree *cache_tree;
        time_t timestamp;
        void *alloc;
-       unsigned name_hash_initialized : 1;
+       unsigned name_hash_initialized : 1,
+                initialized : 1;
        struct hash_table name_hash;
 };
 
@@ -451,6 +452,7 @@ enum safe_crlf {
 extern enum safe_crlf safe_crlf;
 
 enum branch_track {
+       BRANCH_TRACK_UNSPECIFIED = -1,
        BRANCH_TRACK_NEVER = 0,
        BRANCH_TRACK_REMOTE,
        BRANCH_TRACK_ALWAYS,