Junio C Hamano <gitster@xxxxxxxxx> writes:
> Jeff King <peff@xxxxxxxx> writes:
>
>> There are no callers of the slightly-dangerous static-buffer
>> git_path_submodule left. Let's drop it.
>
> There are a few callers added on 'pu', though.
Actually there is only one. Here is a proposed evil merge.
diff --git a/submodule.c b/submodule.c
index dfe8b7b..7ab08a1 100644
--- a/submodule.c
+++ b/submodule.c
@@ -120,34 +120,35 @@ void stage_updated_gitmodules(void)
static int add_submodule_odb(const char *path)
{
struct alternate_object_database *alt_odb;
- const char *objects_directory;
+ struct strbuf objects_directory = STRBUF_INIT;
int ret = 0;
- objects_directory = git_path_submodule(path, "objects/");
- if (!is_directory(objects_directory)) {
+ strbuf_git_path_submodule(&objects_directory, "objects/", "%s", path);
+ if (!is_directory(objects_directory.buf)) {
ret = -1;
goto done;
}
/* avoid adding it twice */
for (alt_odb = alt_odb_list; alt_odb; alt_odb = alt_odb->next)
- if (alt_odb->name - alt_odb->base == strlen(objects_directory) &&
- !strcmp(alt_odb->base, objects_directory))
+ if (alt_odb->name - alt_odb->base == objects_directory.len &&
+ !strcmp(alt_odb->base, objects_directory.buf))
goto done;
- alt_odb = xmalloc(strlen(objects_directory) + 42 + sizeof(*alt_odb));
+ alt_odb = xmalloc(objects_directory.len + 42 + sizeof(*alt_odb));
alt_odb->next = alt_odb_list;
- strcpy(alt_odb->base, objects_directory);
- alt_odb->name = alt_odb->base + strlen(objects_directory);
+ strcpy(alt_odb->base, objects_directory.buf);
+ alt_odb->name = alt_odb->base + objects_directory.len;
alt_odb->name[2] = '/';
alt_odb->name[40] = '\0';
alt_odb->name[41] = '\0';
alt_odb_list = alt_odb;
/* add possible alternates from the submodule */
- read_info_alternates(objects_directory, 0);
+ read_info_alternates(objects_directory.buf, 0);
prepare_alt_odb();
done:
+ strbuf_release(&objects_directory);
return ret;
}
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html