t7700: test that 'repack -a' packs alternate packed objects

diff --git a/cache.h b/cache.h
index a1e4982cd424ec5c3695c2221583bca1bd861614..7595c149ea10aa847f01235a2c1ca17129d43fe4 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -565,6 +565,7 @@ extern int move_temp_to_file(const char *tmpfile, const char *filename);
 
 extern int has_sha1_pack(const unsigned char *sha1, const char **ignore);
 extern int has_sha1_file(const unsigned char *sha1);
+extern int has_loose_object_nonlocal(const unsigned char *sha1);
 
 extern int has_pack_file(const unsigned char *sha1);
 extern int has_pack_index(const unsigned char *sha1);
@@ -671,7 +672,8 @@ extern struct packed_git {
        int index_version;
        time_t mtime;
        int pack_fd;
-       int pack_local;
+       unsigned pack_local:1,
+                pack_keep:1;
        unsigned char sha1[20];
        /* something like ".git/objects/pack/xxxxx.pack" */
        char pack_name[FLEX_ARRAY]; /* more */