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>

diff --git a/builtin/rm.c b/builtin/rm.c
index 90cbe896c99188130a36a18aa18a57cd080be591..be8edc6d1e1185fa0224b516c0e4f73ceb590aa3 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -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++) {
 {
        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))
                        continue;
 
                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)

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 8c72ea864c81d8763ac48ee7e1e7795e1323ddb3..7262f1a0005f203f0e24bd9dacfe6d336c17558a 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -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++)
                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;
 }
 
        return 0;
 }

diff --git a/submodule.c b/submodule.c
index 2cfaba059993e356e11eeabfaf5f67e9e26a3519..0f199c51378dc93458904abcaca4f58875952313 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -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))
        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",
                                        ABSORB_GITDIR_RECURSE_SUBMODULES);
                } else {
                        char *gitdir = xstrfmt("%s/modules/%s",


@@ -1997,8 +1997,7 @@ int submodule_move_head(const char *path,
  * Embeds a single submodules git directory into the superprojects git dir,
  * non recursively.
  */
  * 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;
 {
        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/.
  */
  * 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;
                                      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))
                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);
 
                free(real_sub_git_dir);
                free(real_common_git_dir);

diff --git a/submodule.h b/submodule.h
index 9e18e9b80760ad1562682125bc90d08fb6e1c0d3..8072e6d6ddfd847ca8f739e9d8af9b815c43e21d 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -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 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);
 
 /*
                                      unsigned flags);
 
 /*