mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-14 12:46:13 +02:00
Code

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>
This commit is contained in:
Antonio Ospite 2018-06-26 12:47:08 +02:00 committed by Junio C Hamano
parent 057449978e
commit 588929d54d
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
submodule-config.c
View File

@ -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.
*/
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);

12
submodule-config.h
View File

@ -57,15 +57,13 @@ void submodule_free(struct repository *r);
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);