diff options
author | Junio C Hamano <junkio@cox.net> | 2005-08-15 15:53:37 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-08-15 15:53:37 -0700 |
commit | da27f4f3f4c23d0276a372726ed050ed13e45168 (patch) | |
tree | 8842fbebf0db214d0bc8c68e2918a712b7edede3 /cache.h | |
parent | Merge master into rc (diff) | |
parent | [PATCH] Add documentation for git repack and git-prune-packed. (diff) | |
download | tgif-da27f4f3f4c23d0276a372726ed050ed13e45168.tar.xz |
Merge master changes into rc.
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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 { |