undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Stefan Beller 2016-03-31 17:17:28 -07:00 committed by Junio C Hamano
parent 47d5d64879
commit f8eaa0ba98
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
builtin/submodule--helper.c
View File

@ -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; const char *reference = NULL, *depth = NULL;
int quiet = 0; int quiet = 0;
FILE *submodule_dot_git; 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 rel_path = STRBUF_INIT;
struct strbuf sb = 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")); die(_("submodule--helper: unspecified or empty --path"));
strbuf_addf(&sb, "%s/modules/%s", get_git_dir(), name); 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 (!file_exists(sm_gitdir)) {
if (safe_create_leading_directories_const(sm_gitdir) < 0) 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(&sb);
strbuf_reset(&rel_path); 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"); p = git_pathdup_submodule(path, "config");
if (!p) if (!p)
die(_("could not get submodule directory for '%s'"), path); die(_("could not get submodule directory for '%s'"), path);
git_config_set_in_file(p, "core.worktree", 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(&sb);
strbuf_release(&rel_path); strbuf_release(&rel_path);
free(sm_gitdir); free(sm_gitdir_rel);
free(cwd); free(path);
free(p); free(p);
return 0; return 0;
} }

2
t/t7400-submodule-basic.sh
View File

@ -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" && test_when_finished "rm -rf super clone2 subsub sub3" &&
mkdir subsub && mkdir subsub &&
( (