Actually this also allows read_info_alternates and link_alt_odb_entry to
handle arbitrary object stores, but link_alt_odb_entries is the most
interesting function in this set of functions, hence the commit subject.
These functions span a strongly connected component in the function
graph, i.e. the recursive call chain might look like
-> link_alt_odb_entries
-> link_alt_odb_entry
-> read_info_alternates
-> link_alt_odb_entries
That is why we need to convert all these functions at the same time.
Signed-off-by: Jonathan Nieder <jrnie...@gmail.com>
Signed-off-by: Stefan Beller <sbel...@google.com>
---
cache.h | 4 ++++
sha1_file.c | 42 +++++++++++++++++++++++++-----------------
2 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/cache.h b/cache.h
index 018a297e10..12bb42f951 100644
--- a/cache.h
+++ b/cache.h
@@ -1593,6 +1593,10 @@ struct alternate_object_database {
char loose_objects_subdir_seen[256];
struct oid_array loose_objects_cache;
+ /*
+ * Path to the alternative object store. If this is a relative path,
+ * it is relative to the current working directory.
+ */
char path[FLEX_ARRAY];
};
extern void prepare_alt_odb(void);
diff --git a/sha1_file.c b/sha1_file.c
index a8e23bd2f8..c4255a2da6 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -389,9 +389,11 @@ static int alt_odb_usable(struct raw_object_store *o,
* SHA1, an extra slash for the first level indirection, and the
* terminating NUL.
*/
-static void read_info_alternates(const char * relative_base, int depth);
-static int link_alt_odb_entry(const char *entry, const char *relative_base,
- int depth, const char *normalized_objdir)
+static void read_info_alternates(struct raw_object_store *o,
+ const char *relative_base,
+ int depth);
+static int link_alt_odb_entry(struct raw_object_store *o, const char *entry,
+ const char *relative_base, int depth, const char *normalized_objdir)
{
struct alternate_object_database *ent;
struct strbuf pathbuf = STRBUF_INIT;
@@ -416,7 +418,7 @@ static int link_alt_odb_entry(const char *entry, const char
*relative_base,
while (pathbuf.len && pathbuf.buf[pathbuf.len - 1] == '/')
strbuf_setlen(&pathbuf, pathbuf.len - 1);
- if (!alt_odb_usable(&the_repository->objects, &pathbuf,
normalized_objdir)) {
+ if (!alt_odb_usable(o, &pathbuf, normalized_objdir)) {
strbuf_release(&pathbuf);
return -1;
}
@@ -424,12 +426,12 @@ static int link_alt_odb_entry(const char *entry, const
char *relative_base,
ent = alloc_alt_odb(pathbuf.buf);
/* add the alternate entry */
- *the_repository->objects.alt_odb_tail = ent;
- the_repository->objects.alt_odb_tail = &(ent->next);
+ *o->alt_odb_tail = ent;
+ o->alt_odb_tail = &(ent->next);
ent->next = NULL;
/* recursively add alternates */
- read_info_alternates(pathbuf.buf, depth + 1);
+ read_info_alternates(o, pathbuf.buf, depth + 1);
strbuf_release(&pathbuf);
return 0;
@@ -464,8 +466,8 @@ static const char *parse_alt_odb_entry(const char *string,
return end;
}
-static void link_alt_odb_entries(const char *alt, int sep,
- const char *relative_base, int depth)
+static void link_alt_odb_entries(struct raw_object_store *o, const char *alt,
+ int sep, const char *relative_base, int depth)
{
struct strbuf objdirbuf = STRBUF_INIT;
struct strbuf entry = STRBUF_INIT;
@@ -479,7 +481,7 @@ static void link_alt_odb_entries(const char *alt, int sep,
return;
}
- strbuf_add_absolute_path(&objdirbuf, get_object_directory());
+ strbuf_add_absolute_path(&objdirbuf, o->objectdir);
if (strbuf_normalize_path(&objdirbuf) < 0)
die("unable to normalize object directory: %s",
objdirbuf.buf);
@@ -488,13 +490,16 @@ static void link_alt_odb_entries(const char *alt, int sep,
alt = parse_alt_odb_entry(alt, sep, &entry);
if (!entry.len)
continue;
- link_alt_odb_entry(entry.buf, relative_base, depth,
objdirbuf.buf);
+ link_alt_odb_entry(o, entry.buf,
+ relative_base, depth, objdirbuf.buf);
}
strbuf_release(&entry);
strbuf_release(&objdirbuf);
}
-static void read_info_alternates(const char * relative_base, int depth)
+static void read_info_alternates(struct raw_object_store *o,
+ const char *relative_base,
+ int depth)
{
char *path;
struct strbuf buf = STRBUF_INIT;
@@ -506,7 +511,7 @@ static void read_info_alternates(const char *
relative_base, int depth)
return;
}
- link_alt_odb_entries(buf.buf, '\n', relative_base, depth);
+ link_alt_odb_entries(o, buf.buf, '\n', relative_base, depth);
strbuf_release(&buf);
free(path);
}
@@ -560,7 +565,8 @@ void add_to_alternates_file(const char *reference)
if (commit_lock_file(&lock))
die_errno("unable to move new alternates file into
place");
if (the_repository->objects.alt_odb_tail)
- link_alt_odb_entries(reference, '\n', NULL, 0);
+ link_alt_odb_entries(&the_repository->objects,
reference,
+ '\n', NULL, 0);
}
free(alts);
}
@@ -573,7 +579,8 @@ void add_to_alternates_memory(const char *reference)
*/
prepare_alt_odb();
- link_alt_odb_entries(reference, '\n', NULL, 0);
+ link_alt_odb_entries(&the_repository->objects, reference,
+ '\n', NULL, 0);
}
/*
@@ -676,9 +683,10 @@ void prepare_alt_odb(void)
the_repository->objects.alt_odb_tail =
&the_repository->objects.alt_odb_list;
- link_alt_odb_entries(alt, PATH_SEP, NULL, 0);
+ link_alt_odb_entries(&the_repository->objects, alt,
+ PATH_SEP, NULL, 0);
- read_info_alternates(get_object_directory(), 0);
+ read_info_alternates(&the_repository->objects, get_object_directory(),
0);
}
/* Returns 1 if we have successfully freshened the file, 0 otherwise. */
--
2.16.1.291.g4437f3f132-goog
