summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-25 11:26:38 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-25 11:26:38 -0700
commit69e82602b9a5a01bc225d9b4e7a65a9daba506cb (patch)
treea1fbafe5fb22f2d96e782a0833b9c2b70c4aea31 /cache.h
parent98eb3fc6cbdede41809e29166ddad4edf6acd1f4 (diff)
parent5e73633dbf8a62190611f6eb438a1a2eaaffa919 (diff)
downloadgit-69e82602b9a5a01bc225d9b4e7a65a9daba506cb.tar.gz
Merge branch 'hv/submodule-alt-odb' into maint
When a submodule repository uses alternate object store mechanism, some commands that were started from the superproject did not notice it and failed with "No such object" errors. The subcommands of "git submodule" command that recursed into the submodule in a separate process were OK; only the ones that cheated and peeked directly into the submodule's repository from the primary process were affected. By Heiko Voigt * hv/submodule-alt-odb: teach add_submodule_odb() to look for alternates
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 5bf59ff5c3..84b8229748 100644
--- a/cache.h
+++ b/cache.h
@@ -992,6 +992,7 @@ extern struct alternate_object_database {
char base[FLEX_ARRAY]; /* more */
} *alt_odb_list;
extern void prepare_alt_odb(void);
+extern void read_info_alternates(const char * relative_base, int depth);
extern void add_to_alternates_file(const char *reference);
typedef int alt_odb_fn(struct alternate_object_database *, void *);
extern void foreach_alt_odb(alt_odb_fn, void*);