kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

submodule--helper.c: remove duplicate code 

Remove code fragment from module_clone that duplicates functionality
of connect_work_tree_and_git_dir in dir.c

Signed-off-by: Valery Tolstov <me@vtolstov.org>
Reviewed-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Valery Tolstov 2017-03-14 14:46:25 -07:00 committed by Junio C Hamano
parent 365444a6a5
commit 4682085cd4
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
builtin/submodule--helper.c
View File

@ -579,9 +579,7 @@ static int module_clone(int argc, const char **argv, const char *prefix)
const char *name = NULL, *url = NULL, *depth = NULL; const char *name = NULL, *url = NULL, *depth = NULL;
int quiet = 0; int quiet = 0;
int progress = 0; int progress = 0;
FILE *submodule_dot_git;
char *p, *path = NULL, *sm_gitdir; char *p, *path = NULL, *sm_gitdir;
struct strbuf rel_path = STRBUF_INIT;
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;
struct string_list reference = STRING_LIST_INIT_NODUP; struct string_list reference = STRING_LIST_INIT_NODUP;
char *sm_alternate = NULL, *error_strategy = NULL; char *sm_alternate = NULL, *error_strategy = NULL;
@ -653,27 +651,12 @@ static int module_clone(int argc, const char **argv, const char *prefix)
strbuf_reset(&sb); strbuf_reset(&sb);
} }


/* Write a .git file in the submodule to redirect to the superproject. */ /* Connect module worktree and git dir */
strbuf_addf(&sb, "%s/.git", path); connect_work_tree_and_git_dir(path, sm_gitdir);
if (safe_create_leading_directories_const(sb.buf) < 0)
die(_("could not create leading directories of '%s'"), sb.buf);
submodule_dot_git = fopen(sb.buf, "w");
if (!submodule_dot_git)
die_errno(_("cannot open file '%s'"), sb.buf);


fprintf_or_die(submodule_dot_git, "gitdir: %s\n",
relative_path(sm_gitdir, path, &rel_path));
if (fclose(submodule_dot_git))
die(_("could not close file %s"), sb.buf);
strbuf_reset(&sb);
strbuf_reset(&rel_path);

/* Redirect the worktree of the submodule in the superproject's config */
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",
relative_path(path, sm_gitdir, &rel_path));


/* setup alternateLocation and alternateErrorStrategy in the cloned submodule if needed */ /* setup alternateLocation and alternateErrorStrategy in the cloned submodule if needed */
git_config_get_string("submodule.alternateLocation", &sm_alternate); git_config_get_string("submodule.alternateLocation", &sm_alternate);
@ -689,7 +672,6 @@ static int module_clone(int argc, const char **argv, const char *prefix)
free(error_strategy); free(error_strategy);


strbuf_release(&sb); strbuf_release(&sb);
strbuf_release(&rel_path);
free(sm_gitdir); free(sm_gitdir);
free(path); free(path);
free(p); free(p);