summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-08-15 15:53:37 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2005-08-15 15:53:37 -0700
commitda27f4f3f4c23d0276a372726ed050ed13e45168 (patch)
tree8842fbebf0db214d0bc8c68e2918a712b7edede3 /cache.h
parentMerge master into rc (diff)
parent[PATCH] Add documentation for git repack and git-prune-packed. (diff)
downloadtgif-da27f4f3f4c23d0276a372726ed050ed13e45168.tar.xz
Merge master changes into rc.
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/cache.h b/cache.h
index efd2a2c595..dbde95a0b6 100644
--- a/cache.h
+++ b/cache.h
@@ -278,9 +278,10 @@ struct checkout {
extern int checkout_entry(struct cache_entry *ce, struct checkout *state);
extern struct alternate_object_database {
- char *base;
+ struct alternate_object_database *next;
char *name;
-} *alt_odb;
+ char base[0]; /* more */
+} *alt_odb_list;
extern void prepare_alt_odb(void);
extern struct packed_git {