t1000-t1999: fix broken &&-chains

diff --git a/object-store.h b/object-store.h
index c04b4c95ebd58adb651221798a7ae5eaa3f49eff..d683112fd7bbab5df7e8cd5656b497cb8fd2bda1 100644 (file)
--- a/object-store.h
+++ b/object-store.h
@@ -71,8 +71,10 @@ struct packed_git {
        int index_version;
        time_t mtime;
        int pack_fd;
+       int index;              /* for builtin/pack-objects.c */
        unsigned pack_local:1,
                 pack_keep:1,
+                pack_keep_in_core:1,
                 freshened:1,
                 do_not_close:1,
                 pack_promisor:1;
@@ -99,7 +101,7 @@ struct raw_object_store {
         * Objects that should be substituted by other objects
         * (see git-replace(1)).
         */
-       struct oidmap replace_map;
+       struct oidmap *replace_map;
 
        /*
         * private data