THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Browse Source

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>
tags/v2.23.0-rc0
Jeff King Junio C Hamano 6 months ago
parent
commit
cf7a901ae4
4 changed files with 9 additions and 13 deletions
  1. +3
    -3
      builtin/rm.c
  2. +1
    -2
      builtin/submodule--helper.c
  3. +4
    -6
      submodule.c
  4. +1
    -2
      submodule.h

+ 3
- 3
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;
for (i = 0; i < list.nr; i++) {
@@ -83,7 +83,7 @@ static void submodules_absorb_gitdir_if_needed(const char *prefix)
continue;

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

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)


+ 1
- 2
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;

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

return 0;
}


+ 4
- 6
submodule.c View File

@@ -1910,7 +1910,7 @@ int submodule_move_head(const char *path,
if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) {
if (old_head) {
if (!submodule_uses_gitfile(path))
absorb_git_dir_into_superproject("", path,
absorb_git_dir_into_superproject(path,
ABSORB_GITDIR_RECURSE_SUBMODULES);
} else {
char *gitdir = xstrfmt("%s/modules/%s",
@@ -1997,8 +1997,7 @@ out:
* Embeds a single submodules git directory into the superprojects git dir,
* non recursively.
*/
static void relocate_single_git_dir_into_superproject(const char *prefix,
const char *path)
static void relocate_single_git_dir_into_superproject(const char *path)
{
char *old_git_dir = NULL, *real_old_git_dir = NULL, *real_new_git_dir = NULL;
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
* in its superprojects git dir under modules/.
*/
void absorb_git_dir_into_superproject(const char *prefix,
const char *path,
void absorb_git_dir_into_superproject(const char *path,
unsigned flags)
{
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);

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_common_git_dir);


+ 1
- 2
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);

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

/*


Loading…
Cancel
Save