undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

submodule: add repo_read_gitmodules

Browse Source 
Teach the repo object to be able to populate the submodule_cache by
reading the repository's gitmodules file.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams 2017-06-22 11:43:45 -07:00 committed by Junio C Hamano
parent bf12fcdf5e
commit 69aba5329e
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
submodule.c
View File

@ -1,4 +1,5 @@
#include "cache.h" #include "cache.h"
#include "repository.h"
#include "config.h" #include "config.h"
#include "submodule-config.h" #include "submodule-config.h"
#include "submodule.h" #include "submodule.h"
@ -255,6 +256,20 @@ void gitmodules_config(void)
} }
} }
static int gitmodules_cb(const char *var, const char *value, void *data)
{
struct repository *repo = data;
return submodule_config_option(repo, var, value);
}
void repo_read_gitmodules(struct repository *repo)
{
char *gitmodules_path = repo_worktree_path(repo, ".gitmodules");
git_config_from_file(gitmodules_cb, gitmodules_path, repo);
free(gitmodules_path);
}
void gitmodules_config_sha1(const unsigned char *commit_sha1) void gitmodules_config_sha1(const unsigned char *commit_sha1)
{ {
struct strbuf rev = STRBUF_INIT; struct strbuf rev = STRBUF_INIT;

2
submodule.h
View File

@ -1,6 +1,7 @@
#ifndef SUBMODULE_H #ifndef SUBMODULE_H
#define SUBMODULE_H #define SUBMODULE_H
struct repository;
struct diff_options; struct diff_options;
struct argv_array; struct argv_array;
struct oid_array; struct oid_array;
@ -46,6 +47,7 @@ int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
const char *arg, int unset); const char *arg, int unset);
void load_submodule_cache(void); void load_submodule_cache(void);
extern void gitmodules_config(void); extern void gitmodules_config(void);
extern void repo_read_gitmodules(struct repository *repo);
extern void gitmodules_config_sha1(const unsigned char *commit_sha1); extern void gitmodules_config_sha1(const unsigned char *commit_sha1);
extern int is_submodule_initialized(const char *path); extern int is_submodule_initialized(const char *path);
/* /*