aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-12 22:00:43 -0800
committerJunio C Hamano <gitster@pobox.com>2008-11-12 22:00:43 -0800
commitecbbfb15a42987deb6620c4575c420002313af23 (patch)
tree541cc88566a9cac6f8bf473c31879bf536f71c5c /cache.h
parenta5b2d4ac24ef18cf8c628e258bef8a20d9bf4b2b (diff)
parent3289b9dec56d34fe05f90c262d11adc0a61e16e7 (diff)
downloadgit-ecbbfb15a42987deb6620c4575c420002313af23.tar.gz
git-ecbbfb15a42987deb6620c4575c420002313af23.tar.xz
Merge branch 'bc/maint-keep-pack'
* bc/maint-keep-pack: 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.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index 6be60ea3f..c776f2f5a 100644
--- a/cache.h
+++ b/cache.h
@@ -580,6 +580,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);
@@ -688,7 +689,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 */