submodule-config: make 'config_from_gitmodules' private

Now that 'config_from_gitmodules' is not used in the open, it can be
marked as private.

Hopefully this will prevent its usage for retrieving arbitrary
configuration form the '.gitmodules' file.

Signed-off-by: Antonio Ospite <ao2@ao2.it>
Acked-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/submodule-config.c b/submodule-config.c
index 9a2b13d8bcabe7c912a15b7d54bf7fc4a1926a54..cd1f1e06a67e6b1ed66a786deb81fa959fcf328a 100644 (file)
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -673,14 +673,14 @@ void submodule_free(struct repository *r)
 }
 
 /*
 }
 
 /*

- * Note: This function exists solely to maintain backward compatibility with
- * 'fetch' and 'update_clone' storing configuration in '.gitmodules' and should
- * NOT be used anywhere else.
+ * Note: This function is private for a reason, the '.gitmodules' file should
+ * not be used as as a mechanism to retrieve arbitrary configuration stored in
+ * the repository.

  *
  * Runs the provided config function on the '.gitmodules' file found in the
  * working directory.
  */
  *
  * Runs the provided config function on the '.gitmodules' file found in the
  * working directory.
  */

-void config_from_gitmodules(config_fn_t fn, void *data)
+static void config_from_gitmodules(config_fn_t fn, void *data)

 {
        if (the_repository->worktree) {
                char *file = repo_worktree_path(the_repository, GITMODULES_FILE);
 {
        if (the_repository->worktree) {
                char *file = repo_worktree_path(the_repository, GITMODULES_FILE);

diff --git a/submodule-config.h b/submodule-config.h
index b6f19d0d42a9610c3e90c56c90642195bc24ef13..dc7278eea45deedc33635af50b016e9ee28df7d2 100644 (file)
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -57,15 +57,13 @@ void submodule_free(struct repository *r);
 int check_submodule_name(const char *name);
 
 /*
 int check_submodule_name(const char *name);
 
 /*

- * Note: This function exists solely to maintain backward compatibility with
- * 'fetch' and 'update_clone' storing configuration in '.gitmodules' and should
- * NOT be used anywhere else.
+ * Note: these helper functions exist solely to maintain backward
+ * compatibility with 'fetch' and 'update_clone' storing configuration in
+ * '.gitmodules'.

  *
  *

- * Runs the provided config function on the '.gitmodules' file found in the
- * working directory.
+ * New helpers to retrieve arbitrary configuration from the '.gitmodules' file
+ * should NOT be added.

  */
  */

-extern void config_from_gitmodules(config_fn_t fn, void *data);
-

 extern void fetch_config_from_gitmodules(int *max_children, int *recurse_submodules);
 extern void update_clone_config_from_gitmodules(int *max_jobs);
 
 extern void fetch_config_from_gitmodules(int *max_children, int *recurse_submodules);
 extern void update_clone_config_from_gitmodules(int *max_jobs);