submodule--helper, module_clone: always operate on absolute paths

When giving relative paths to `relative_path` to compute a relative path
from one directory to another, this may fail in `relative_path`.
Make sure both arguments to `relative_path` are always absolute.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 0b9f546de5b2f6a3151fd88056887d007a42e7a3..b660a22cbefb1f91c5e24af653947df4eb53c99b 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -153,11 +153,12 @@ static int clone_submodule(const char *path, const char *gitdir, const char *url
 
 static int module_clone(int argc, const char **argv, const char *prefix)
 {
 
 static int module_clone(int argc, const char **argv, const char *prefix)
 {

-       const char *path = NULL, *name = NULL, *url = NULL;
+       const char *name = NULL, *url = NULL;

        const char *reference = NULL, *depth = NULL;
        int quiet = 0;
        FILE *submodule_dot_git;
        const char *reference = NULL, *depth = NULL;
        int quiet = 0;
        FILE *submodule_dot_git;

-       char *sm_gitdir, *cwd, *p;
+       char *sm_gitdir_rel, *p, *path = NULL;
+       const char *sm_gitdir;

        struct strbuf rel_path = STRBUF_INIT;
        struct strbuf sb = STRBUF_INIT;
 
        struct strbuf rel_path = STRBUF_INIT;
        struct strbuf sb = STRBUF_INIT;
 


@@ -198,7 +199,14 @@ static int module_clone(int argc, const char **argv, const char *prefix)
                die(_("submodule--helper: unspecified or empty --path"));
 
        strbuf_addf(&sb, "%s/modules/%s", get_git_dir(), name);
                die(_("submodule--helper: unspecified or empty --path"));
 
        strbuf_addf(&sb, "%s/modules/%s", get_git_dir(), name);

-       sm_gitdir = strbuf_detach(&sb, NULL);
+       sm_gitdir_rel = strbuf_detach(&sb, NULL);
+       sm_gitdir = absolute_path(sm_gitdir_rel);
+
+       if (!is_absolute_path(path)) {
+               strbuf_addf(&sb, "%s/%s", get_git_work_tree(), path);
+               path = strbuf_detach(&sb, NULL);
+       } else
+               path = xstrdup(path);

 
        if (!file_exists(sm_gitdir)) {
                if (safe_create_leading_directories_const(sm_gitdir) < 0)
 
        if (!file_exists(sm_gitdir)) {
                if (safe_create_leading_directories_const(sm_gitdir) < 0)


@@ -229,24 +237,16 @@ static int module_clone(int argc, const char **argv, const char *prefix)
        strbuf_reset(&sb);
        strbuf_reset(&rel_path);
 
        strbuf_reset(&sb);
        strbuf_reset(&rel_path);
 

-       cwd = xgetcwd();

        /* Redirect the worktree of the submodule in the superproject's config */
        /* Redirect the worktree of the submodule in the superproject's config */

-       if (!is_absolute_path(sm_gitdir)) {
-               strbuf_addf(&sb, "%s/%s", cwd, sm_gitdir);
-               free(sm_gitdir);
-               sm_gitdir = strbuf_detach(&sb, NULL);
-       }
-
-       strbuf_addf(&sb, "%s/%s", cwd, path);

        p = git_pathdup_submodule(path, "config");
        if (!p)
                die(_("could not get submodule directory for '%s'"), path);
        git_config_set_in_file(p, "core.worktree",
        p = git_pathdup_submodule(path, "config");
        if (!p)
                die(_("could not get submodule directory for '%s'"), path);
        git_config_set_in_file(p, "core.worktree",

-                              relative_path(sb.buf, sm_gitdir, &rel_path));
+                              relative_path(path, sm_gitdir, &rel_path));

        strbuf_release(&sb);
        strbuf_release(&rel_path);
        strbuf_release(&sb);
        strbuf_release(&rel_path);

-       free(sm_gitdir);
-       free(cwd);
+       free(sm_gitdir_rel);
+       free(path);

        free(p);
        return 0;
 }
        free(p);
        return 0;
 }

diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index fc1180999e0f7c63c7ea08b170dc0ddf3e1f9a1f..ea3fabbed87a6bd3e91f4d1d9a640411fd04b9d6 100755 (executable)
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -818,7 +818,7 @@ test_expect_success 'submodule add --name allows to replace a submodule with ano
        )
 '
 
        )
 '
 

-test_expect_failure 'recursive relative submodules stay relative' '
+test_expect_success 'recursive relative submodules stay relative' '

        test_when_finished "rm -rf super clone2 subsub sub3" &&
        mkdir subsub &&
        (
        test_when_finished "rm -rf super clone2 subsub sub3" &&
        mkdir subsub &&
        (