Re: [PATCH 10/17] path.c: drop git_path_submodule
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:06:08
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 10/17] path.c: drop git_path_submodule · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 10/17] path.c: drop git_path_submodule · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 10/17] path.c: drop git_path_submodule · Jeff King <hidden>
- 2016-06-15 · [PATCH 10/17] path.c: drop git_path_submodule · Jeff King <hidden>
Junio C Hamano [off-list ref] writes:
Junio C Hamano [off-list ref] writes:quoted
Jeff King [off-list ref] writes:quoted
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.
Sorry, that didn't work X-<.
diff --git a/submodule.c b/submodule.c
index dfe8b7b..0cdaeb8 100644
--- a/submodule.c
+++ b/submodule.c@@ -120,10 +120,10 @@ void stage_updated_gitmodules(void) static int add_submodule_odb(const char *path) { struct alternate_object_database *alt_odb; - const char *objects_directory; + char *objects_directory; int ret = 0; - objects_directory = git_path_submodule(path, "objects/"); + objects_directory = git_pathdup_submodule(path, "objects/"); if (!is_directory(objects_directory)) { ret = -1; goto done;
@@ -148,6 +148,7 @@ static int add_submodule_odb(const char *path) read_info_alternates(objects_directory, 0); prepare_alt_odb(); done: + free(objects_directory); return ret; }