[PATCH 2/4] submodule refactor: use git_path_submodule() in add_submodule_odb()

[Max Kirillov]

Signed-off-by: Max Kirillov <m...@max630.net>
---
 submodule.c | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/submodule.c b/submodule.c
index 34094f5..4aad3d4 100644
--- a/submodule.c
+++ b/submodule.c
@@ -122,43 +122,35 @@ void stage_updated_gitmodules(void)
 
 static int add_submodule_odb(const char *path)
 {
-       struct strbuf objects_directory = STRBUF_INIT;
        struct alternate_object_database *alt_odb;
+       const char* objects_directory;
        int ret = 0;
-       const char *git_dir;
 
-       strbuf_addf(&objects_directory, "%s/.git", path);
-       git_dir = read_gitfile(objects_directory.buf);
-       if (git_dir) {
-               strbuf_reset(&objects_directory);
-               strbuf_addstr(&objects_directory, git_dir);
-       }
-       strbuf_addstr(&objects_directory, "/objects/");
-       if (!is_directory(objects_directory.buf)) {
+       objects_directory = git_path_submodule(path, "objects/");
+       if (!is_directory(objects_directory)) {
                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 == objects_directory.len &&
-                               !strncmp(alt_odb->base, objects_directory.buf,
-                                       objects_directory.len))
+               if (alt_odb->name - alt_odb->base == strlen(objects_directory) 
&&
+                               !strcmp(alt_odb->base, objects_directory))
                        goto done;
 
-       alt_odb = xmalloc(objects_directory.len + 42 + sizeof(*alt_odb));
+       alt_odb = xmalloc(strlen(objects_directory) + 42 + sizeof(*alt_odb));
        alt_odb->next = alt_odb_list;
-       strcpy(alt_odb->base, objects_directory.buf);
-       alt_odb->name = alt_odb->base + objects_directory.len;
+       strcpy(alt_odb->base, objects_directory);
+       alt_odb->name = alt_odb->base + strlen(objects_directory);
        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.buf, 0);
+       read_info_alternates(objects_directory, 0);
        prepare_alt_odb();
 done:
-       strbuf_release(&objects_directory);
        return ret;
 }
 
-- 
2.0.1.1697.g73c6810

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html