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

submodule: drop unused prefix parameter from some functions 

We stopped using the "prefix" parameter of
relocate_single_git_dir_into_superproject() and its callers in
202275b96b (submodule.c: get_super_prefix_or_empty, 2017-03-14), where
we switched to using the environment global directly.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2019-05-09 17:27:31 -04:00 committed by Junio C Hamano
parent d64db5b334
commit cf7a901ae4
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/rm.c
View File

@ -61,7 +61,7 @@ static void print_error_files(struct string_list *files_list,
} }
} }


static void submodules_absorb_gitdir_if_needed(const char *prefix) static void submodules_absorb_gitdir_if_needed(void)
{ {
int i; int i;
for (i = 0; i < list.nr; i++) { for (i = 0; i < list.nr; i++) {
@ -83,7 +83,7 @@ static void submodules_absorb_gitdir_if_needed(const char *prefix)
continue; continue;


if (!submodule_uses_gitfile(name)) if (!submodule_uses_gitfile(name))
absorb_git_dir_into_superproject(prefix, name, absorb_git_dir_into_superproject(name,
ABSORB_GITDIR_RECURSE_SUBMODULES); ABSORB_GITDIR_RECURSE_SUBMODULES);
} }
} }
@ -313,7 +313,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
} }


if (!index_only) if (!index_only)
submodules_absorb_gitdir_if_needed(prefix); submodules_absorb_gitdir_if_needed();


/* /*
* If not forced, the file, the index and the HEAD (if exists) * If not forced, the file, the index and the HEAD (if exists)

3
builtin/submodule--helper.c
View File

@ -2107,8 +2107,7 @@ static int absorb_git_dirs(int argc, const char **argv, const char *prefix)
return 1; return 1;


for (i = 0; i < list.nr; i++) for (i = 0; i < list.nr; i++)
absorb_git_dir_into_superproject(prefix, absorb_git_dir_into_superproject(list.entries[i]->name, flags);
list.entries[i]->name, flags);


return 0; return 0;
} }

10
submodule.c
View File

@ -1910,7 +1910,7 @@ int submodule_move_head(const char *path,
if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) { if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
if (old_head) { if (old_head) {
if (!submodule_uses_gitfile(path)) if (!submodule_uses_gitfile(path))
absorb_git_dir_into_superproject("", path, absorb_git_dir_into_superproject(path,
ABSORB_GITDIR_RECURSE_SUBMODULES); ABSORB_GITDIR_RECURSE_SUBMODULES);
} else { } else {
char *gitdir = xstrfmt("%s/modules/%s", char *gitdir = xstrfmt("%s/modules/%s",
@ -1997,8 +1997,7 @@ out:
* Embeds a single submodules git directory into the superprojects git dir, * Embeds a single submodules git directory into the superprojects git dir,
* non recursively. * non recursively.
*/ */
static void relocate_single_git_dir_into_superproject(const char *prefix, static void relocate_single_git_dir_into_superproject(const char *path)
const char *path)
{ {
char *old_git_dir = NULL, *real_old_git_dir = NULL, *real_new_git_dir = NULL; char *old_git_dir = NULL, *real_old_git_dir = NULL, *real_new_git_dir = NULL;
const char *new_git_dir; const char *new_git_dir;
@ -2040,8 +2039,7 @@ static void relocate_single_git_dir_into_superproject(const char *prefix,
* having its git directory within the working tree to the git dir nested * having its git directory within the working tree to the git dir nested
* in its superprojects git dir under modules/. * in its superprojects git dir under modules/.
*/ */
void absorb_git_dir_into_superproject(const char *prefix, void absorb_git_dir_into_superproject(const char *path,
const char *path,
unsigned flags) unsigned flags)
{ {
int err_code; int err_code;
@ -2082,7 +2080,7 @@ void absorb_git_dir_into_superproject(const char *prefix,
char *real_common_git_dir = real_pathdup(get_git_common_dir(), 1); char *real_common_git_dir = real_pathdup(get_git_common_dir(), 1);


if (!starts_with(real_sub_git_dir, real_common_git_dir)) if (!starts_with(real_sub_git_dir, real_common_git_dir))
relocate_single_git_dir_into_superproject(prefix, path); relocate_single_git_dir_into_superproject(path);


free(real_sub_git_dir); free(real_sub_git_dir);
free(real_common_git_dir); free(real_common_git_dir);

3
submodule.h
View File

@ -141,8 +141,7 @@ void submodule_unset_core_worktree(const struct submodule *sub);
void prepare_submodule_repo_env(struct argv_array *out); void prepare_submodule_repo_env(struct argv_array *out);


#define ABSORB_GITDIR_RECURSE_SUBMODULES (1<<0) #define ABSORB_GITDIR_RECURSE_SUBMODULES (1<<0)
void absorb_git_dir_into_superproject(const char *prefix, void absorb_git_dir_into_superproject(const char *path,
const char *path,
unsigned flags); unsigned flags);


/* /*