submodule: use new config API for worktree configurations

We remove the extracted functions and directly parse into and read out
of the cache. This allows us to have one unified way of accessing
submodule configuration values specific to single submodules. Regardless
whether we need to access a configuration from history or from the
worktree.

Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Heiko Voigt
2015-08-17 17:21:59 -07:00
committed by Junio C Hamano
parent 0d9f282c94
commit 851e18c385
9 changed files with 104 additions and 138 deletions

View File

@ -1,5 +1,6 @@
#include "cache.h"
#include "submodule-config.h"
#include "submodule.h"
static void die_usage(int argc, char **argv, const char *msg)
{
@ -8,6 +9,11 @@ static void die_usage(int argc, char **argv, const char *msg)
exit(1);
}
static int git_test_config(const char *var, const char *value, void *cb)
{
return parse_submodule_config_option(var, value);
}
int main(int argc, char **argv)
{
char **arg = argv;
@ -29,6 +35,10 @@ int main(int argc, char **argv)
if (my_argc % 2 != 0)
die_usage(argc, argv, "Wrong number of arguments.");
setup_git_directory();
gitmodules_config();
git_config(git_test_config, NULL);
while (*arg) {
unsigned char commit_sha1[20];
const struct submodule *submodule;