diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-12-03 07:00:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-03 07:00:04 (GMT) |
| commit | 0fd9d7e66deb7071da2a568b96c94f94ee890908 (patch) | |
| tree | e8af2cdc7eee0aaa92087e7e798aa8d1c0d6acf1 /cache.h | |
| parent | e23f6822df5ee0acfe244c819a419c3e7c8c9e7e (diff) | |
| parent | 83d0289df6fb4deae100ee3fc37b90683c2e8c9f (diff) | |
| download | git-0fd9d7e66deb7071da2a568b96c94f94ee890908.zip git-0fd9d7e66deb7071da2a568b96c94f94ee890908.tar.gz git-0fd9d7e66deb7071da2a568b96c94f94ee890908.tar.bz2 | |
Merge branch 'bc/maint-keep-pack' into maint
* bc/maint-keep-pack:
repack: only unpack-unreachable if we are deleting redundant packs
t7700: test that 'repack -a' packs alternate packed objects
pack-objects: extend --local to mean ignore non-local loose objects too
sha1_file.c: split has_loose_object() into local and non-local counterparts
t7700: demonstrate mishandling of loose objects in an alternate ODB
builtin-gc.c: use new pack_keep bitfield to detect .keep file existence
repack: do not fall back to incremental repacking with [-a|-A]
repack: don't repack local objects in packs with .keep file
pack-objects: new option --honor-pack-keep
packed_git: convert pack_local flag into a bitfield and add pack_keep
t7700: demonstrate mishandling of objects in packs with a .keep file
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -567,6 +567,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); @@ -673,7 +674,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 */ |