From 94351118c0a820002b093598e7fac5bdf3c0291f Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sun, 24 Feb 2008 17:17:14 -0500 Subject: make alias lookup a public, procedural function This converts git_config_alias to the public alias_lookup function. Because of the nature of our config parser, we still have to rely on setting static data. However, that interface is wrapped so that you can just say value = alias_lookup(key); Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- git.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'git.c') diff --git a/git.c b/git.c index 0cb86884d7..8f08b12295 100644 --- a/git.c +++ b/git.c @@ -87,19 +87,6 @@ static int handle_options(const char*** argv, int* argc, int* envchanged) return handled; } -static const char *alias_command; -static char *alias_string; - -static int git_alias_config(const char *var, const char *value) -{ - if (!prefixcmp(var, "alias.") && !strcmp(var + 6, alias_command)) { - if (!value) - return config_error_nonbool(var); - alias_string = xstrdup(value); - } - return 0; -} - static int split_cmdline(char *cmdline, const char ***argv) { int src, dst, count = 0, size = 16; @@ -159,11 +146,13 @@ static int handle_alias(int *argcp, const char ***argv) const char *subdir; int count, option_count; const char** new_argv; + const char *alias_command; + char *alias_string; subdir = setup_git_directory_gently(&nongit); alias_command = (*argv)[0]; - git_config(git_alias_config); + alias_string = alias_lookup(alias_command); if (alias_string) { if (alias_string[0] == '!') { if (*argcp > 1) { -- cgit v1.2.3